diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-22 14:02:48 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-22 14:02:48 -0700 |
commit | f518ae90a612e83f8b5148211f54e1f6de445b81 (patch) | |
tree | 88114fd8a3595c8f9ca3bdb9ea42c6fe887e03b7 /ChangeLog | |
parent | 92a9cc651ac716a90f87bc1e256c16ed1fa220cc (diff) | |
download | emacs-f518ae90a612e83f8b5148211f54e1f6de445b81.tar.gz |
Merge from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index ead1709e5dc..a3c17418bd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-22 Paul Eggert <eggert@cs.ucla.edu> + + * lib/intprops.h, lib/stdint.in.h, m4/mktime.m4, m4/readlink.m4: + Merge from gnulib. + 2011-05-21 Andreas Schwab <schwab@linux-m68k.org> * Makefile.in (AUTOMAKE_INPUTS): Add $(srcdir)/lib/gnulib.mk. |