aboutsummaryrefslogtreecommitdiffstats
path: root/doc/man
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /doc/man
parentaca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff)
parentd8fb8cce84b923a3289b69549e30958710ac3ebb (diff)
downloademacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz
emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'doc/man')
-rw-r--r--doc/man/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index afd6b7b6051..8a2a90f7895 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -144,7 +144,7 @@
144;; coding: utf-8 144;; coding: utf-8
145;; End: 145;; End:
146 146
147 Copyright (C) 2007-2012 Free Software Foundation, Inc. 147 Copyright (C) 2007-2013 Free Software Foundation, Inc.
148 148
149 This file is part of GNU Emacs. 149 This file is part of GNU Emacs.
150 150