Merge ChangeLog.unicode files into ChangeLogs

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

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9ebfbc2..634f96f 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,19 @@
+2008-02-02  Jason Rumney  <jasonr@gnu.org>
+
+       * makefile.w32-in (obj): Sync with src/Makefile.in
+       (TOOLTIP_SUPPORT, WINDOW_SUPPORT): New definitions.
+       (WINNT_SUPPORT): Add term/w32-win.elc.
+       (lisp1, lisp2): Sync with lisp in src/Makefile.in.
+
+2008-02-02  Jason Rumney  <jasonr@gnu.org>
+
+       * makefile.w32-in (obj): Add font.o and w32font.o
+
+2008-02-02  Zhang Wei <id.brep@gmail.com>  (tiny change)
+
+       * lib-src/makefile.w32-in (lisp1): Delete ucs-tables.elc,
+       utf-8.elc, and latin-*.el.
+
 2008-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacsclient.c (decode_options): Default to a NULL display, as Emacs-22.