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 c9e9d4a1acc..f278206494b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12012-05-27 Paul Eggert <eggert@cs.ucla.edu>
2
3 Assume gnulib does largefile.
4 * merge-gnulib (GNULIB_MODULES): Add largefile.
5
12012-05-22 Paul Eggert <eggert@cs.ucla.edu> 62012-05-22 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Remove src/m/*. 8 Remove src/m/*.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index fa082d94664..7f91b788f40 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -29,7 +29,7 @@ GNULIB_MODULES='
29 alloca-opt 29 alloca-opt
30 careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 30 careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
31 dtoastr dup2 31 dtoastr dup2
32 filemode getloadavg getopt-gnu ignore-value intprops lstat 32 filemode getloadavg getopt-gnu ignore-value intprops largefile lstat
33 manywarnings mktime pthread_sigmask readlink 33 manywarnings mktime pthread_sigmask readlink
34 socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat 34 socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
35 warnings 35 warnings