summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog.2
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.2
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
downloademacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz
Merge from emacs-23
Diffstat (limited to 'lisp/ChangeLog.2')
-rw-r--r--lisp/ChangeLog.22
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 90c00dc6360..57ae07d0f10 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -3993,7 +3993,7 @@
See ChangeLog.1 for earlier changes.
Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.