Merge from mainline.

2 files changed, 6 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fd7097c0956..0a05a066648 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Branch for 23.2.
+
 2010-02-20  Kevin Ryde  <user42@zip.com.au>
 
         * etags.c (Scheme_functions): Don't loop past a null character
@@ -21,7 +25,7 @@
 
 2009-11-23  Tobias Ringström  <tobias@ringis.se>  (tiny change)
 
-        * etags.c (absolute_filename): Use memove if we have it for
+        * etags.c (absolute_filename): Use memmove if we have it for
         overlapping copy.
 
 2009-11-04  Dan Nicolaescu  <dann@ics.uci.edu>
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 368e1acb447..14130d2e525 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
-VERSION         = 23.1.93
+VERSION         = 24.0.50
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \