aboutsummaryrefslogtreecommitdiffstats
path: root/nextstep/ChangeLog
diff options
context:
space:
mode:
authorDaniel Colascione2012-09-17 04:07:36 -0800
committerDaniel Colascione2012-09-17 04:07:36 -0800
commit2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (patch)
tree6dd6784d63e54cb18071df8e28fbdbc27d418728 /nextstep/ChangeLog
parentf701ab72dd55460d23c8b029550aa4d7ecef3cfa (diff)
parentbb7dce392f6d9d5fc4b9d7de09ff920a52f07669 (diff)
downloademacs-2ab329f3b5d52a39f0a45c3d9c129f1c19560142.tar.gz
emacs-2ab329f3b5d52a39f0a45c3d9c129f1c19560142.zip
Merge from trunk
Diffstat (limited to 'nextstep/ChangeLog')
-rw-r--r--nextstep/ChangeLog19
1 files changed, 19 insertions, 0 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 6451f7a7322..53f42c97716 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,22 @@
12012-09-17 Glenn Morris <rgm@gnu.org>
2
3 * templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in:
4 * templates/Info.plist.in: Let configure set copyright.
5
62012-09-16 Glenn Morris <rgm@gnu.org>
7
8 * Makefile.in: New file.
9 * templates: New directory.
10 * templates/Emacs.desktop.in, templates/Info-gnustep.plist.in:
11 * templates/Info.plist.in, templates/InfoPlist.strings.in:
12 Move here from various Cocoa/, GNUstep/ locations.
13 Let configure set the version number.
14 * Cocoa/Emacs.base/Contents/Info.plist:
15 * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
16 * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
17 * GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
18 * Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
19
12012-04-07 Glenn Morris <rgm@gnu.org> 202012-04-07 Glenn Morris <rgm@gnu.org>
2 21
3 * Cocoa/Emacs.base/Contents/Info.plist: 22 * Cocoa/Emacs.base/Contents/Info.plist: