aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rwxr-xr-xadmin/merge-gnulib2
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index cbcd698e8b1..5373a9d20b6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12013-08-04 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix some minor races in hosts lacking mkostemp (Bug#15015).
4 * merge-gnulib (GNULIB_MODULES): Add mkostemp.
5
12013-07-12 Glenn Morris <rgm@gnu.org> 62013-07-12 Glenn Morris <rgm@gnu.org>
2 7
3 * admin.el (manual-style-string): Use non-abbreviated url. 8 * admin.el (manual-style-string): Use non-abbreviated url.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 82e0cd77fca..97126704d10 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -32,7 +32,7 @@ GNULIB_MODULES='
32 fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync 32 fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
33 getloadavg getopt-gnu gettime gettimeofday 33 getloadavg getopt-gnu gettime gettimeofday
34 intprops largefile lstat 34 intprops largefile lstat
35 manywarnings memrchr mktime 35 manywarnings memrchr mkostemp mktime
36 pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat 36 pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
37 sig2str socklen stat-time stdalign stdarg stdbool stdio 37 sig2str socklen stat-time stdalign stdarg stdbool stdio
38 strftime strtoimax strtoumax symlink sys_stat 38 strftime strtoimax strtoumax symlink sys_stat