diff options
| author | Andrey Hristov <andrey@php.net> | 2014-01-29 15:32:02 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-01-29 15:32:02 +0200 |
| commit | 1c7f54d4f7fe58f1d2c7ed00ca80d93dddc265ab (patch) | |
| tree | b981a37d3072a193d0fe9791fc75d3b3b83208f2 /ext/zip/php_zip.h | |
| parent | fb5c7cda5d776a84730c5133f27e72cb427f22ae (diff) | |
| parent | 253a66c8d56e72b166b2d8ebfbc4b368eed4a9fb (diff) | |
| download | php-git-1c7f54d4f7fe58f1d2c7ed00ca80d93dddc265ab.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
NEWS
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/zip/php_zip.h')
| -rw-r--r-- | ext/zip/php_zip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 591b907aa8..ffe4530415 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -38,7 +38,7 @@ extern zend_module_entry zip_module_entry; #define ZIP_OVERWRITE ZIP_TRUNCATE #endif -#define PHP_ZIP_VERSION "1.12.4-dev" +#define PHP_ZIP_VERSION "1.12.4" #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6) # define PHP_ZIP_USE_OO 1 |