Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 711-712)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-199

2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 04657225ab0..e91b99e98af 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-26  Glenn Morris  <rgm@gnu.org>
+
+        * makefile.w32-in (VERSION): Increase to 22.1.50.
+
 2007-02-26  Francesco Potort,Al(B  <pot@gnu.org>
 
         * Makefile.in (etags, ctags): Define EMACS_NAME as "GNU Emacs".
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 356e70b3102..d5e147557aa 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
-VERSION         = 22.0.98
+VERSION         = 22.1.50
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \