aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorJoakim Verona2013-02-13 00:04:17 +0100
committerJoakim Verona2013-02-13 00:04:17 +0100
commite46029ad6dda065541c8de40de0fe9d5800ac770 (patch)
tree891ff36967b0ef02459ee46b6363b75bf810d524 /admin
parente0444a0966fa001953bb97cfb60451c42220be8e (diff)
parentc4131562319d3529841136d236ac39fb1e3d2b7c (diff)
downloademacs-e46029ad6dda065541c8de40de0fe9d5800ac770.tar.gz
emacs-e46029ad6dda065541c8de40de0fe9d5800ac770.zip
auto upstream
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rwxr-xr-xadmin/merge-gnulib3
2 files changed, 7 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 76ac11446a3..7e72e10cd9f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12013-02-11 Paul Eggert <eggert@cs.ucla.edu>
2
3 Tune by using memchr and memrchr.
4 * merge-gnulib (GNULIB_MODULES): Add memrchr.
5
12013-02-01 Paul Eggert <eggert@cs.ucla.edu> 62013-02-01 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539). 8 Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539).
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index e90e2e23b29..b43f2bd9bb8 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -31,7 +31,8 @@ GNULIB_MODULES='
31 dtoastr dtotimespec dup2 environ execinfo faccessat 31 dtoastr dtotimespec dup2 environ execinfo faccessat
32 fcntl-h fdopendir filemode fstatat getloadavg getopt-gnu gettime gettimeofday 32 fcntl-h fdopendir filemode fstatat getloadavg getopt-gnu gettime gettimeofday
33 ignore-value intprops largefile lstat 33 ignore-value intprops largefile lstat
34 manywarnings mktime pselect pthread_sigmask putenv readlink readlinkat 34 manywarnings memrchr mktime
35 pselect pthread_sigmask putenv readlink readlinkat
35 sig2str socklen stat-time stdalign stdarg stdbool stdio 36 sig2str socklen stat-time stdalign stdarg stdbool stdio
36 strftime strtoimax strtoumax symlink sys_stat 37 strftime strtoimax strtoumax symlink sys_stat
37 sys_time time timer-time timespec-add timespec-sub unsetenv utimens 38 sys_time time timer-time timespec-add timespec-sub unsetenv utimens