diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-15 15:27:54 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-15 15:27:54 -0700 |
| commit | 8aeb5be96aa28c4770299a54758a8fb339993a97 (patch) | |
| tree | dbf3821be90ab7a043a6552aa9b838a6259677e4 /ChangeLog | |
| parent | 4bba86e6210a74326e843a8fdc8409127105e1fe (diff) | |
| download | emacs-8aeb5be96aa28c4770299a54758a8fb339993a97.tar.gz | |
Merge from gnulib: lib/gnulib.mk, m4/*.m4.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index c6531ffba3f..f9d1c974359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ 2011-06-15 Paul Eggert <eggert@cs.ucla.edu> - * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib. + * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: + * lib/gnulib.mk, m4/c-strtod.m4, m4/filemode.m4, m4/getloadavg.m4: + * m4/getopt.m4, m4/gl-comp.m4, m4/lstat.m4, m4/md5.m4, m4/mktime.m4: + * m4/readlink.m4, m4/sha1.m4, m4/stat.m4, m4/strftime.m4: + * m4/strtoull.m4, m4/strtoumax.m4, m4/symlink.m4, m4/time_r.m4: + Merge from gnulib. 2011-06-14 Jan Djärv <jan.h.d@swipnet.se> |