diff options
| author | Alan Mackenzie | 2011-11-03 22:03:18 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2011-11-03 22:03:18 +0000 |
| commit | 85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b (patch) | |
| tree | 2a207d6e9e906119087ad357c892414db01211cb /admin/ChangeLog | |
| parent | a6ba2ab9277496b66f6939766a3470c1f0a84287 (diff) | |
| parent | 14e1d9eab9f4b7341f92397a0a9a2706f7b26ee9 (diff) | |
| download | emacs-85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b.tar.gz emacs-85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b.zip | |
Merge.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 7c2f1a743b2..f91d53194ce 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-10-31 David Engster <deng@randomsample.de> | ||
| 2 | |||
| 3 | * grammars/bovine-grammar.el: Avoid using old-style backquotes. | ||
| 4 | |||
| 1 | 2011-10-28 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-10-28 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * nt/README-ftp-server: Mention UNICOWS.DLL as prerequisite for | 7 | * nt/README-ftp-server: Mention UNICOWS.DLL as prerequisite for |