diff options
| author | Paul Eggert | 2011-10-29 10:33:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-29 10:33:13 -0700 |
| commit | 8d0eb4c275581847990b85dbb350caa3df9e653f (patch) | |
| tree | c161f977d59ac3103b04dc0f4aea57c83436a456 /admin/ChangeLog | |
| parent | 929bb973dd3faf1655f03ac758942d5b009354ad (diff) | |
| parent | 196e41e4aec1a44ec5b6e9bed485185ba872ae67 (diff) | |
| download | emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.tar.gz emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.zip | |
Merge from trunk.
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 |