X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0bb24df135e9c44d2e5a78b58b10719eea9e413b..f113707a071b5b35224861ddba3db881d74a164e:/admin/merge-gnulib diff --git a/admin/merge-gnulib b/admin/merge-gnulib index dc3cd6cf54..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,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