diff options
| author | Alan Mackenzie | 2011-10-28 15:18:00 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2011-10-28 15:18:00 +0000 |
| commit | e376ea4f737a9230a9767a12bdcc530da4b4da87 (patch) | |
| tree | e74b45fc923a012322eb229ca403fcd07ec1f696 /admin/ChangeLog | |
| parent | 1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab (diff) | |
| parent | d3d0842fe219892079cac179ab0843792f29cf1a (diff) | |
| download | emacs-e376ea4f737a9230a9767a12bdcc530da4b4da87.tar.gz emacs-e376ea4f737a9230a9767a12bdcc530da4b4da87.zip | |
Merge.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 7648b2a8455..7c2f1a743b2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-10-28 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * nt/README-ftp-server: Mention UNICOWS.DLL as prerequisite for | ||
| 4 | running Emacs on Windows 9X. | ||
| 5 | |||
| 1 | 2011-09-26 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-09-26 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * admin.el (set-version): Fix regexps for config.nt and | 8 | * admin.el (set-version): Fix regexps for config.nt and |