Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl.web@gmail.com

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2a6cd7192204ef7d6f80851f3cfa614791c01365..ffd9f7d31f6b14dc72b7c1efa9da97964c41723a 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-07  Glenn Morris  <rgm@gnu.org>
+
+       * forms/forms-d2.el, forms/forms-pass.el: Move here from ../lisp.
+       * forms/forms-d2.dat: Move to forms/ subdirectory.
+       * forms/README: New.
+
 2012-05-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: Do not limit current-time-string to years 1000..9999.