Changeset 3db30a68 in rtems


Ignore:
Timestamp:
Mar 18, 2011, 10:11:48 AM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.11, master
Children:
c26dd0d
Parents:
c80c2f2 (diff), 4f05dd9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

This commit was generated by cvs2svn to compensate for changes in r25214,
which included commits to RCS files with non-trunk default branches.

Location:
cpukit/zlib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cpukit/zlib/contrib/vstudio/vc10/zlib.rc

    rc80c2f2 r3db30a68  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1,2,4,0
    6   PRODUCTVERSION 1,2,4,0
     5  FILEVERSION    1,2,5,0
     6  PRODUCTVERSION 1,2,5,0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.4.0\0"
     20      VALUE "FileVersion",      "1.2.5\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlib.dll\0"
  • cpukit/zlib/contrib/vstudio/vc9/zlib.rc

    rc80c2f2 r3db30a68  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1,2,4,0
    6   PRODUCTVERSION 1,2,4,0
     5  FILEVERSION    1,2,5,0
     6  PRODUCTVERSION 1,2,5,0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.4.0\0"
     20      VALUE "FileVersion",      "1.2.5\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlib.dll\0"
  • cpukit/zlib/treebuild.xml

    rc80c2f2 r3db30a68  
    11<?xml version="1.0" ?>
    2 <package name="zlib" version="1.2.4">
    3     <library name="zlib" dlversion="1.2.4" dlname="z">
     2<package name="zlib" version="1.2.5">
     3    <library name="zlib" dlversion="1.2.5" dlname="z">
    44        <property name="description"> zip compression library </property>
    55        <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
Note: See TracChangeset for help on using the changeset viewer.