diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-22 15:56:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-22 15:56:58 +0200 |
| commit | 66841fa144ddd72df67ab1ddf880ca508d4bc9e3 (patch) | |
| tree | 7cf0afebcfa94bcc8b2046c85532efcf6b0f91d0 /zlib/contrib/delphi/ZLib.pas | |
| parent | 1a68b7aceea62a76127f0fa13b3f127e37b2ec76 (diff) | |
| parent | 7baa3d795c87c11550f1686488c968320428cbf9 (diff) | |
| download | vcxsrv-66841fa144ddd72df67ab1ddf880ca508d4bc9e3.tar.gz vcxsrv-66841fa144ddd72df67ab1ddf880ca508d4bc9e3.tar.bz2 vcxsrv-66841fa144ddd72df67ab1ddf880ca508d4bc9e3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
zlib/Makefile
Diffstat (limited to 'zlib/contrib/delphi/ZLib.pas')
| -rw-r--r-- | zlib/contrib/delphi/ZLib.pas | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zlib/contrib/delphi/ZLib.pas b/zlib/contrib/delphi/ZLib.pas index 3f2b8b4a5..f24bb3eda 100644 --- a/zlib/contrib/delphi/ZLib.pas +++ b/zlib/contrib/delphi/ZLib.pas @@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; const OutBuf: Pointer; BufSize: Integer); const - zlib_version = '1.2.3'; + zlib_version = '1.2.7'; type EZlibError = class(Exception); |