merge trunk

1 files changed, 9 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7a3104c9c40..e082eee36bf 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
+
+        * admin.el: Write version number to nt/makefile.w32-in.
+        * nt/makedist.bat: Remove; replaced with `zipdist.bat'
+        in the nt/ directory.
+        * nt/README.W32: Relocate to nt/ directory.
+
 2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
 
         * CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.
@@ -432,7 +439,7 @@
 
         * charsets/mapconv: Handle UNICODE2.
 
-        * charsets/Makefile (CJK): Include CP932-2BYTE.map
+        * charsets/Makefile (CJK): Include CP932-2BYTE.map.
         (CP932-2BYTE.map): New target.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
@@ -752,7 +759,7 @@
 
 2004-08-28  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * FOR-RELEASE (Indications): Remove entry about GTK and geometry,
+        * FOR-RELEASE (Indications): Remove entry about GTK and geometry
         (now behaves as well as other ports).
 
 2004-06-28  Jan Djärv  <jan.h.d@swipnet.se>