diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 7 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 18bb44491a1..c579930d2bf 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-08-14 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Use bool for Emacs Lisp booleans. | ||
| 4 | * merge-gnulib (GNULIB_MODULES): Add stdbool. This documents a | ||
| 5 | new direct dependency; stdbool was already being used indirectly | ||
| 6 | via other gnulib modules. | ||
| 7 | |||
| 1 | 2012-08-11 Glenn Morris <rgm@gnu.org> | 8 | 2012-08-11 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * bzrmerge.el (bzrmerge-resolve): Disable local eval:. | 10 | * bzrmerge.el (bzrmerge-resolve): Disable local eval:. |
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 49d194c8033..c5b9eba5ee6 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -32,7 +32,7 @@ GNULIB_MODULES=' | |||
| 32 | filemode getloadavg getopt-gnu gettime gettimeofday | 32 | filemode getloadavg getopt-gnu gettime gettimeofday |
| 33 | ignore-value intprops largefile lstat | 33 | ignore-value intprops largefile lstat |
| 34 | manywarnings mktime pselect pthread_sigmask readlink | 34 | manywarnings mktime pselect pthread_sigmask readlink |
| 35 | socklen stat-time stdalign stdarg stdio | 35 | socklen stat-time stdalign stdarg stdbool stdio |
| 36 | strftime strtoimax strtoumax symlink sys_stat | 36 | strftime strtoimax strtoumax symlink sys_stat |
| 37 | sys_time time timespec-add timespec-sub utimens | 37 | sys_time time timespec-add timespec-sub utimens |
| 38 | warnings | 38 | warnings |