summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-04-10 22:31:09 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-04-10 22:31:09 +0000
commita1f0e804366162c98d7ff5b3a0bef7d6b729bb80 (patch)
tree7fb3031cdf05cbef2eca36b933b31fae9c345cb3
parent1e29c1716d0af180c377d602b98fbdea72f4a5ca (diff)
downloadphp-git-a1f0e804366162c98d7ff5b3a0bef7d6b729bb80.tar.gz
Back to dev
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 9cdcf0ac6c..1f4e922ae8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? Apr 2008, PHP 5.2.6
+
10 Apr 2008, PHP 5.2.6RC5
- Fixed incorrect heredoc handling when label is used within the block.
(Matt Wilmas)
diff --git a/configure.in b/configure.in
index 674cf6e967..bd6785e6b9 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=2
PHP_RELEASE_VERSION=6
-PHP_EXTRA_VERSION="RC5"
+PHP_EXTRA_VERSION="RC6-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 d813427004..530a7c2db9 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 2
#define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION "RC5"
-#define PHP_VERSION "5.2.6RC5"
+#define PHP_EXTRA_VERSION "RC6-dev"
+#define PHP_VERSION "5.2.6RC6-dev"
#define PHP_VERSION_ID 50206