Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 698-710)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 216)

   - Update from CVS

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

1 files changed, 4 insertions, 4 deletions

diff --git a/nt/emacs.rc b/nt/emacs.rc
index 892d23df019..99427cc5742 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,97,0
- PRODUCTVERSION 22,0,97,0
+ FILEVERSION 22,0,98,0
+ PRODUCTVERSION 22,0,98,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, 97, 0\0"
+            VALUE "FileVersion", "22, 0, 98, 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, 97, 0\0"
+            VALUE "ProductVersion", "22, 0, 98, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END