summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog.14
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-01-14 12:18:41 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2011-01-14 12:18:41 -0500
commit77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree258514dac7faab41642d8f319eb113c8a5f09690 /lisp/ChangeLog.14
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
downloademacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz
Merge from emacs-23
Diffstat (limited to 'lisp/ChangeLog.14')
-rw-r--r--lisp/ChangeLog.142
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index cfb6b84269c..2919d6f6559 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -20551,7 +20551,7 @@ See ChangeLog.13 for earlier changes.
;; coding: utf-8
;; End:
- Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.