summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2007-11-08 13:53:14 +0000
committerIlia Alshanetsky <iliaa@php.net>2007-11-08 13:53:14 +0000
commit01254364392f8152e06c2c2b2ff5da99800ef994 (patch)
tree682540dd63dd08bfaed58949d89cea0d65c1cb08
parentaf81b9d973a323103e3eb8ecebcf67d2df71d2ca (diff)
downloadphp-git-01254364392f8152e06c2c2b2ff5da99800ef994.tar.gz
Back to dev
-rw-r--r--NEWS4
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h8
3 files changed, 9 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 99bee76209..f1f30713a6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-08 Nov 2007 , PHP 5.2.5
+?? ??? 2008, PHP 5.2.6
+
+08 Nov 2007, PHP 5.2.5
- Upgraded PCRE to version 7.3 (Nuno)
- Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
- Added alpha support for imagefilter() IMG_FILTER_COLORIZE. (Pierre)
diff --git a/configure.in b/configure.in
index bf09a03e30..177b1095d9 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=5
-PHP_EXTRA_VERSION=""
+PHP_RELEASE_VERSION=6
+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 c4cd550849..4edfe87cb8 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 5
-#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.2.5"
-#define PHP_VERSION_ID 50205
+#define PHP_RELEASE_VERSION 6
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.2.6-dev"
+#define PHP_VERSION_ID 50206