diff options
| author | Eli Zaretskii | 2013-05-16 12:58:56 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-05-16 12:58:56 +0300 |
| commit | a9519e2685d19b13ce4e3e1ba13f97569013627e (patch) | |
| tree | 6a9e0e35514c400749f23c891e9a95577fb9bfc1 /lib-src/ChangeLog | |
| parent | 3946d31b7bcf2a7dceacb86598823360f457cd19 (diff) | |
| parent | 2d4bf34b5b83b3728b2fb18a72536f3e14afcf34 (diff) | |
| download | emacs-a9519e2685d19b13ce4e3e1ba13f97569013627e.tar.gz emacs-a9519e2685d19b13ce4e3e1ba13f97569013627e.zip | |
Merge from trunk.
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bd7618e0a82..63108cae9a9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(DOC)): Use DOC rather than DOC-X. | ||
| 4 | |||
| 1 | 2013-05-06 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-05-06 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo, | 7 | * make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo, |