Merge unicode branch

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

diff --git a/lib-src/ChangeLog.unicode b/lib-src/ChangeLog.unicode
index 0ee77a4..7d105d8 100644 (file)
--- a/lib-src/ChangeLog.unicode
+++ b/lib-src/ChangeLog.unicode
@@ -1,3 +1,10 @@
+2007-10-21  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.
+
 2007-06-06  Jason Rumney  <jasonr@gnu.org>
 
        * makefile.w32-in (obj): Add font.o and w32font.o