This commit was generated by cvs2svn to compensate for changes in r25214,

which included commits to RCS files with non-trunk default branches.

cpukit/zlib/contrib/vstudio/vc10/zlib.rc

@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1,2,4,0
-  PRODUCTVERSION 1,2,4,0
+  FILEVERSION	 1,2,5,0
+  PRODUCTVERSION 1,2,5,0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.4.0\0"
+      VALUE "FileVersion",	"1.2.5\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlib.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"

cpukit/zlib/contrib/vstudio/vc9/zlib.rc

@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1,2,4,0
-  PRODUCTVERSION 1,2,4,0
+  FILEVERSION	 1,2,5,0
+  PRODUCTVERSION 1,2,5,0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.4.0\0"
+      VALUE "FileVersion",	"1.2.5\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlib.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"

cpukit/zlib/treebuild.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.4">
-    <library name="zlib" dlversion="1.2.4" dlname="z">
+<package name="zlib" version="1.2.5">
+    <library name="zlib" dlversion="1.2.5" dlname="z">
 	<property name="description"> zip compression library </property>
 	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />