diff options
| author | Paul Eggert | 2014-03-25 21:16:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-03-25 21:16:13 -0700 |
| commit | cefcfbcc1b7865dafd615c0fe42e62dbe2660ddd (patch) | |
| tree | 9e0b51810e1fd2ce97f50a3af8540ecc0f47597c /doc/misc/ChangeLog | |
| parent | b18d7820f32694a5f386f2a334b81c2fcd9edf0a (diff) | |
| download | emacs-cefcfbcc1b7865dafd615c0fe42e62dbe2660ddd.tar.gz emacs-cefcfbcc1b7865dafd615c0fe42e62dbe2660ddd.zip | |
Merge from gnulib.
This incorporates:
2014-03-26 strftime: wrap macros in "do {...} while(0)"
* lib/strftime.c, doc/misc/texinfo.tex: Update from gnulib.
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 9f01da8bc21..1cb16188abd 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-03-26 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * texinfo.tex: Update from gnulib. | ||
| 4 | |||
| 1 | 2014-03-24 Michael Albinus <michael.albinus@gmx.de> | 5 | 2014-03-24 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * tramp.texi (Frequently Asked Questions): Add fish shell settings. | 7 | * tramp.texi (Frequently Asked Questions): Add fish shell settings. |