diff options
| author | Johannes Schlüter <johannes@php.net> | 2010-07-22 11:06:58 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2010-07-22 11:06:58 +0000 |
| commit | 60cda4261256335e22a791a8841e972d6b7474f1 (patch) | |
| tree | 5f9b0ed0c8e766c3927d2df7a5c142906c2cfd82 | |
| parent | 95fb5ed9f2cf1823055efb99b32701f0b847821b (diff) | |
| download | php-git-60cda4261256335e22a791a8841e972d6b7474f1.tar.gz | |
- back to -dev
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | main/php_version.h | 8 |
3 files changed, 9 insertions, 6 deletions
@@ -1,5 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2010, PHP 5.2.15 + + 22 Jul 2010, PHP 5.2.14 - Reverted bug fix #49521 (PDO fetchObject sets values before calling constructor). (Felipe) diff --git a/configure.in b/configure.in index 675c42ca08..c8825326d1 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=14 -PHP_EXTRA_VERSION="" +PHP_RELEASE_VERSION=15 +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 21819c47ff..80f452c7a4 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 14 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.14" -#define PHP_VERSION_ID 50214 +#define PHP_RELEASE_VERSION 15 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.2.15-dev" +#define PHP_VERSION_ID 50215 |