Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org

[bpt/emacs.git] / nextstep / ChangeLog

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index be73bc1..9095802 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * Makefile.in (${ns_appdir}): Add touch.
+
+2012-09-17  Glenn Morris  <rgm@gnu.org>
+
+       * templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in:
+       * templates/Info.plist.in: Let configure set copyright.
+
 2012-09-16  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in: New file.
@@ -245,7 +254,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2008-2012  Free Software Foundation, Inc.
+  Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.