merge master

[gnu-emacs] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index 18c3a03eaed0a5ab936d0e7c8fba46fe0768fa3c..e7131c02f628bfec716389aa2bb5e0c77d80be6a 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,7 +1,7 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
 
-Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2014
-  Free Software Foundation, Inc.
+Copyright (C) 1985-1987, 1993-1995, 1997-1999, 2001-2015 Free Software
+Foundation, Inc.
 
 This file is part of GNU Emacs.