X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/190644a0115a592f237b5f7c91f0f96e82edb864..f113707a071b5b35224861ddba3db881d74a164e:/admin/merge-gnulib?ds=inline

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index a11b6e06d2..9e2b10dc4c 100755
--- 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,11 +35,11 @@ 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
-  sys_time time timer-time timespec-add timespec-sub
+  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
-  warnings
+  vla warnings
 '
 
 GNULIB_TOOL_FLAGS='