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

[bpt/emacs.git] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3a5440e..92b970e 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,16 @@
+2013-01-01  Juanma Barranquero  <lekktu@gmail.com>
+
+       * makefile.w32-in (lisp1): Add macroexp.elc (bug#13320).
+
+2012-12-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       * makefile.w32-in (SYSWAIT_H): Update dependencies.
+
+2012-12-10  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (obj): Add w32notify.o.  Add missing X and Unix
+       sources.
+
 2012-12-02  Kevin Ryde  <user42@zip.com.au>
 
        * etags.c (Lisp_functions): Skip (defvar foo) declarations unless
@@ -104,10 +117,6 @@
        (main): Retry connection with alt_display if connection with main
        display fails.
 
-2012-10-07  Eli Zaretskii  <eliz@gnu.org>
-
-       * makefile.w32-in (obj): Add w32notify.o.
-
 2012-10-01  Fabrice Popineau  <fabrice.popineau@gmail.com>
 
        * make-docfile.c (write_globals): Special-case
@@ -8474,7 +8483,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1988-1999, 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 1988-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.