diff options
| author | Joakim Verona | 2013-08-27 19:32:10 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-27 19:32:10 +0200 |
| commit | ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4 (patch) | |
| tree | f2e7b583160ca1f9735006d6304e5d7f479498e3 /doc/misc/ChangeLog | |
| parent | 9d6363e6a7ca3d8c89d8e1e92500793a56e749e6 (diff) | |
| parent | 278208b8e6917af1e7e2623a3869614fa70059ed (diff) | |
| download | emacs-ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4.tar.gz emacs-ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4.zip | |
merge from trunk
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 03af4b34942..ca620a15b4f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-08-27 Glenn Morris <rgm@gnu.org> | 1 | 2013-08-27 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * efaq.texi: Rename from faq.texi, to match its output files. | ||
| 4 | * Makefile.in: Update for faq.texi name change. | ||
| 5 | |||
| 3 | * efaq-w32.texi (EMACSVER): Get it from emacsver.texi. | 6 | * efaq-w32.texi (EMACSVER): Get it from emacsver.texi. |
| 4 | 7 | ||
| 5 | * Makefile.in (webhack): Remove; it's nothing to do with Emacs. | 8 | * Makefile.in (webhack): Remove; it's nothing to do with Emacs. |