diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2010-12-08 22:33:02 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2010-12-08 22:33:02 +0000 |
| commit | d08a99eaca8f4d9dde1238b8796d2c1c2cbaade6 (patch) | |
| tree | 7e79ab670fd5fafb36b2ebf0bf4203550ca7a406 | |
| parent | d85168ae7db1abf506d6c04de78bfbb3f4a80507 (diff) | |
| download | php-git-d08a99eaca8f4d9dde1238b8796d2c1c2cbaade6.tar.gz | |
Back to dev, one final time ;-)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | main/php_version.h | 8 |
3 files changed, 8 insertions, 6 deletions
@@ -1,5 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ?? ????, PHP 5.2.15 + 09 Dec 2010, PHP 5.2.15 - Fixed extract() to do not overwrite $GLOBALS and $this when using EXTR_OVERWRITE. (jorto at redhat dot com) diff --git a/configure.in b/configure.in index 9cedfa8a19..a74485ce3b 100644 --- a/configure.in +++ b/configure.in @@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=15 -PHP_EXTRA_VERSION="" +PHP_RELEASE_VERSION=16 +PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index fe29056662..883d5f2969 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 15 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.15" -#define PHP_VERSION_ID 50215 +#define PHP_RELEASE_VERSION 16 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.2.16-dev" +#define PHP_VERSION_ID 50216 |