Merge from origin/emacs-25

[gnu-emacs] / src / nsfont.m

diff --git a/src/nsfont.m b/src/nsfont.m
index 3d278c0f2fbc90fabb333e76f40e1c3ef80b4517..92e7d1154bf9580cf0b734262025289e1d032881 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1,13 +1,13 @@
 /* Font back-end driver for the NeXT/Open/GNUstep and MacOSX window system.
    See font.h
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of