summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-04-26 04:38:27 +0000
committerMiles Bader <miles@gnu.org>2007-04-26 04:38:27 +0000
commitc71cdfc123dda2dea83d28c0e32d7c61fcb16c3b (patch)
tree65e6d8364cc73706b3c5ac9630ed6030aaba518d /nt
parent52c3f57f0ecb1535fd482ba9de7f014a8b1ecd21 (diff)
parent0701603152f1f0c1961e589a6cf0c84bfa367f8c (diff)
downloademacs-c71cdfc123dda2dea83d28c0e32d7c61fcb16c3b.tar.gz
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
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/emacs.rc8
2 files changed, 8 insertions, 4 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index c5ad2555bbe..e41f31dcac7 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-26 Glenn Morris <rgm@gnu.org>
+
+ * emacs.rc: Increase version to 22.1.50.
+
2007-03-31 Eli Zaretskii <eliz@gnu.org>
* INSTALL: Mention the VCVARS32.BAT batch file for VS.NET users.
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 99427cc5742..cf72b88a8ea 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -6,8 +6,8 @@ Emacs ICON icons\emacs.ico
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,0,98,0
- PRODUCTVERSION 22,0,98,0
+ FILEVERSION 22,1,50,0
+ PRODUCTVERSION 22,1,50,0
FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG
FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
- VALUE "FileVersion", "22, 0, 98, 0\0"
+ VALUE "FileVersion", "22, 1, 50, 0\0"
VALUE "InternalName", "Emacs\0"
VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0"
VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
- VALUE "ProductVersion", "22, 0, 98, 0\0"
+ VALUE "ProductVersion", "22, 1, 50, 0\0"
VALUE "OLESelfRegister", "\0"
END
END