back to dev

diff --git a/NEWS b/NEWS
index d3066f78fe35c554d6149b22360ccb709f8cbb2d..ba61ca11362e1d36dd8202854d0a69eb93d74856 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2011, PHP 5.4.0 RC2
+
 11 Nov 2011, PHP 5.4.0 RC1
 - General improvements:
   . Changed silent conversion of array to string to produce a notice. (Patrick)

diff --git a/configure.in b/configure.in
index b7176a1af76a5580455c42a565ec1228acafbaa9..bc82a7daad989a1a40749f91ca5b5d2cb7a65041 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
 PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION="RC2-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 2fafef3195c9cf5f01d336424e16371c5dcfb3b9..e1811c1dc57d1ef26c97b1ad2ba87c6f34a3413b 100644 (file)
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.0RC1"
+#define PHP_EXTRA_VERSION "RC2-dev"
+#define PHP_VERSION "5.4.0RC2-dev"
 #define PHP_VERSION_ID 50400