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

[bpt/emacs.git] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7101464..18e76e0 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,13 @@
+2012-12-21  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-xtra.texi (copying): The FSF does not sell copies of this.
+       Simply include doclicense.
+
+2012-12-21  Chong Yidong  <cyd@gnu.org>
+
+       * frames.texi (Mouse Commands): Fix description of the effect of
+       mouse dragging (Bug#13049).
+
 2012-12-15  Juri Linkov  <juri@jurta.org>
 
        * misc.texi (Recursive Edit): Add a link to "Query Replace".
@@ -9703,7 +9713,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.