diff options
| author | Paul Eggert | 2014-02-05 11:41:03 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-02-05 11:41:03 -0800 |
| commit | 06c2ec49462474205dbd79a5dbd96bf73367d949 (patch) | |
| tree | 90a5090472895f15ff1fa9aa0bbe475a914b180c /doc/misc/ChangeLog | |
| parent | 81f9a6edde971d8ec7d31cab03a766feb6ae074b (diff) | |
| download | emacs-06c2ec49462474205dbd79a5dbd96bf73367d949.tar.gz emacs-06c2ec49462474205dbd79a5dbd96bf73367d949.zip | |
Merge from gnulib.
This incorporates:
2014-01-23 pthread: work around winpthread header pollution on mingw
* lib/time.in.h: Update from gnulib.
* doc/misc/texinfo.tex: Update from texinfo.
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 0b79841256e..f1d06e0b1be 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-02-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * texinfo.tex: Update from gnulib. | ||
| 4 | |||
| 1 | 2014-02-05 Glenn Morris <rgm@gnu.org> | 5 | 2014-02-05 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * epa.texi: Add indices. | 7 | * epa.texi: Add indices. |