summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2008-02-01 16:05:01 +0000
committerMiles Bader <miles@gnu.org>2008-02-01 16:05:01 +0000
commitaca7a3d2018b432aa76b81005189b6a5a05f18d5 (patch)
treeb796b8b20155698509b206d96d8677de7689b42b /lib-src
parent6cc41fb06c37234822d5aedf7ce0f77b88bb450a (diff)
downloademacs-aca7a3d2018b432aa76b81005189b6a5a05f18d5.tar.gz
Merge ChangeLog.unicode files into ChangeLogs
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1038
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog16
-rw-r--r--lib-src/ChangeLog.unicode17
2 files changed, 16 insertions, 17 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9ebfbc29ecd..634f96f405d 100644
--- 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.
diff --git a/lib-src/ChangeLog.unicode b/lib-src/ChangeLog.unicode
deleted file mode 100644
index 7d105d80983..00000000000
--- a/lib-src/ChangeLog.unicode
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-
-2005-10-14 Zhang Wei <id.brep@gmail.com> (tiny change)
-
- * lib-src/makefile.w32-in (lisp1): Delete ucs-tables.elc,
- utf-8.elc, and latin-*.el.
-
-;; arch-tag: c7cd5592-edad-4f68-a810-0d2704087cf8