aboutsummaryrefslogtreecommitdiffstats
path: root/nextstep/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier2011-01-14 12:18:41 -0500
committerStefan Monnier2011-01-14 12:18:41 -0500
commit77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree258514dac7faab41642d8f319eb113c8a5f09690 /nextstep/ChangeLog
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
downloademacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz
emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip
Merge from emacs-23
Diffstat (limited to 'nextstep/ChangeLog')
-rw-r--r--nextstep/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 26d22b4c90e..84925209c15 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -197,7 +197,7 @@
197;; coding: utf-8 197;; coding: utf-8
198;; End: 198;; End:
199 199
200 Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. 200 Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
201 201
202 This file is part of GNU Emacs. 202 This file is part of GNU Emacs.
203 203