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 /nextstep/ChangeLog | |
| parent | bb7f5cbcda931661c8dc3311603ac764fa87a639 (diff) | |
| parent | d12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (diff) | |
| download | emacs-7c420169baa7c50428589cca7f8eda71b462eb15.tar.gz emacs-7c420169baa7c50428589cca7f8eda71b462eb15.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'nextstep/ChangeLog')
| -rw-r--r-- | nextstep/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index ac060bbcee4..26d22b4c90e 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2011-01-02 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Cocoa/Emacs.base/Contents/Info.plist: | ||
| 4 | * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: | ||
| 5 | * GNUstep/Emacs.base/Resources/Info-gnustep.plist: | ||
| 6 | Set short copyright year to 2011. | ||
| 7 | |||
| 1 | 2010-10-13 Glenn Morris <rgm@gnu.org> | 8 | 2010-10-13 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * README: Remove information duplicated in AUTHORS. | 10 | * README: Remove information duplicated in AUTHORS. |