aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog6
-rwxr-xr-xadmin/merge-gnulib2
2 files changed, 7 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index a20e93d38c2..90d394ca9bd 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
12014-07-14 Paul Eggert <eggert@cs.ucla.edu>
2
3 Use binary-io module, O_BINARY, and "b" flag (Bug#18006).
4 * merge-gnulib (GNULIB_MODULES): Add binary-io. It was already
5 present implicitly; this just makes the dependence explicit.
6
12014-06-30 Glenn Morris <rgm@gnu.org> 72014-06-30 Glenn Morris <rgm@gnu.org>
2 8
3 * update_autogen: Find loaddefs targets rather than 9 * update_autogen: Find loaddefs targets rather than
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 5df2020f3aa..a11b6e06d27 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -26,7 +26,7 @@
26GNULIB_URL=git://git.savannah.gnu.org/gnulib.git 26GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
27 27
28GNULIB_MODULES=' 28GNULIB_MODULES='
29 alloca-opt byteswap c-ctype c-strcase 29 alloca-opt binary-io byteswap c-ctype c-strcase
30 careadlinkat close-stream count-one-bits count-trailing-zeros 30 careadlinkat close-stream count-one-bits count-trailing-zeros
31 crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 31 crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
32 dtoastr dtotimespec dup2 environ execinfo faccessat 32 dtoastr dtotimespec dup2 environ execinfo faccessat