Update copyright year to 2015

[gnu-emacs] / admin / merge-gnulib

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index dc3cd6cf5413da71bc1fd29925c0123db57c27fb..9e2b10dc4ce3acdc293647bb174bb5f33b76b0c6 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -4,7 +4,7 @@
 #
 #      admin/merge-gnulib
 
-# Copyright 2012-2014 Free Software Foundation, Inc.
+# Copyright 2012-2015 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -35,8 +35,8 @@ GNULIB_MODULES='
   intprops largefile lstat
   manywarnings memrchr mkostemp mktime
   pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
-  sig2str socklen stat-time stdalign stdio
-  strftime strtoimax strtoumax symlink sys_stat
+  sig2str socklen stat-time stdalign stddef stdio
+  stpcpy strftime strtoimax strtoumax symlink sys_stat
   sys_time time time_r timer-time timespec-add timespec-sub
   unsetenv update-copyright utimens
   vla warnings