diff options
| author | Chong Yidong | 2011-01-02 15:31:19 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-01-02 15:31:19 -0500 |
| commit | 7c420169baa7c50428589cca7f8eda71b462eb15 (patch) | |
| tree | b556f9e181818bbaf8b5b425844b4ae26e88f537 /admin | |
| parent | bb7f5cbcda931661c8dc3311603ac764fa87a639 (diff) | |
| parent | d12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (diff) | |
| download | emacs-7c420169baa7c50428589cca7f8eda71b462eb15.tar.gz emacs-7c420169baa7c50428589cca7f8eda71b462eb15.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 601f577523b..1314438a10a 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-01-02 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * nt/README.W32: Update the information about PNG support libraries. | ||
| 4 | (Bug#7716) | ||
| 5 | |||
| 1 | 2010-12-27 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-12-27 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * bzrmerge.el: New file to help merge branches while skipping | 8 | * bzrmerge.el: New file to help merge branches while skipping |