diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-06 12:53:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-06 12:53:44 -0700 |
| commit | 9afafefb1b8341816a20eac9491f3f9aaf2aea61 (patch) | |
| tree | 0cddbd8afe6099fb0a4bdf3f3628d5b7a70f68d7 /ChangeLog | |
| parent | 001903b5498d4898455e1a69bff166a9cc699ec0 (diff) | |
| download | emacs-9afafefb1b8341816a20eac9491f3f9aaf2aea61.tar.gz | |
Merge from gnulib.
* lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index c0e5329964e..020991e4677 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-06-06 Paul Eggert <eggert@cs.ucla.edu> + + Merge from gnulib. + * lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge. + 2011-06-02 Paul Eggert <eggert@cs.ucla.edu> * lib/allocator.h, lib/careadlinkat.c: Merge from gnulib. |