summaryrefslogtreecommitdiffstats
path: root/cpukit/zlib
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-03-18 10:11:48 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-03-18 10:11:48 +0000
commit3db30a68ad563417ff93cc90f9138c94d8bf0692 (patch)
tree6ba000b234fac245114c1c52c86a416c37f08626 /cpukit/zlib
parentc80c2f2b043783cbe41267c9f6b69d20310878b1 (diff)
parent4f05dd91a9a12fc2932fa4ac6aabce906eb07419 (diff)
downloadrtems-3db30a68ad563417ff93cc90f9138c94d8bf0692.tar.bz2
This commit was generated by cvs2svn to compensate for changes in r25214,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'cpukit/zlib')
-rw-r--r--cpukit/zlib/contrib/vstudio/vc10/zlib.rc6
-rw-r--r--cpukit/zlib/contrib/vstudio/vc9/zlib.rc6
-rw-r--r--cpukit/zlib/treebuild.xml4
-rw-r--r--cpukit/zlib/zlib.3.pdfbin8688 -> 8686 bytes
4 files changed, 8 insertions, 8 deletions
diff --git a/cpukit/zlib/contrib/vstudio/vc10/zlib.rc b/cpukit/zlib/contrib/vstudio/vc10/zlib.rc
index 23802d86a2..f82245087d 100644
--- a/cpukit/zlib/contrib/vstudio/vc10/zlib.rc
+++ b/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"
diff --git a/cpukit/zlib/contrib/vstudio/vc9/zlib.rc b/cpukit/zlib/contrib/vstudio/vc9/zlib.rc
index 23802d86a2..f82245087d 100644
--- a/cpukit/zlib/contrib/vstudio/vc9/zlib.rc
+++ b/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"
diff --git a/cpukit/zlib/treebuild.xml b/cpukit/zlib/treebuild.xml
index 91ee8912ef..6b8f5428d4 100644
--- a/cpukit/zlib/treebuild.xml
+++ b/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)" />
diff --git a/cpukit/zlib/zlib.3.pdf b/cpukit/zlib/zlib.3.pdf
index 05ed2d015a..9f8a2c3999 100644
--- a/cpukit/zlib/zlib.3.pdf
+++ b/cpukit/zlib/zlib.3.pdf
Binary files differ