Mercurial > emacs
comparison nextstep/ChangeLog @ 112098:40af77a50adc
Merge changes from emacs-23 branch
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 02 Jan 2011 15:28:40 -0500 |
parents | b6368ce2d119 794f724ca655 |
children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
112045:52100bac91db | 112098:40af77a50adc |
---|---|
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. |
4 Move historical information to new file ../etc/NEXTSTEP. | 11 Move historical information to new file ../etc/NEXTSTEP. |
5 * AUTHORS: Merge into ./etc/NEXTSTEP and remove file. | 12 * AUTHORS: Merge into ./etc/NEXTSTEP and remove file. |