Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / man / ChangeLog

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index cf7e1a50c9f3a3d989f89a79b29cf55d89069fa7..8a2a90f7895305337d7eb694f12a34687f754367 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-02  Kevin Ryde  <user42@zip.com.au>
+
+       * etags.1: Mention effect of --declarations in Lisp.
+
+2012-06-03  Glenn Morris  <rgm@gnu.org>
+
+       * rcs-checkin.1: Remove.
+
 2012-04-07  Glenn Morris  <rgm@gnu.org>
 
        * emacs.1: Bump version to 24.1.50.
@@ -134,11 +142,9 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; fill-column: 79
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2007-2012  Free Software Foundation, Inc.
+  Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.