Merge from origin/emacs-25

[gnu-emacs] / src / emacs.c

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