Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/nextstep/ChangeLog Sun Jan 02 11:23:02 2011 +0000 +++ b/nextstep/ChangeLog Sun Jan 02 15:28:40 2011 -0500 @@ -1,3 +1,10 @@ +2011-01-02 Glenn Morris <rgm@gnu.org> + + * Cocoa/Emacs.base/Contents/Info.plist: + * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: + * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + Set short copyright year to 2011. + 2010-10-13 Glenn Morris <rgm@gnu.org> * README: Remove information duplicated in AUTHORS.