From: Stanislav Malyshev <stas@php.net>
Date: Thu, 20 Oct 2011 06:06:35 +0000 (+0000)
Subject: back to dev
X-Git-Tag: php-5.4.0RC1~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93f654e64fb572aba73bd610c9870186d33e96af;p=php

back to dev
---

diff --git a/NEWS b/NEWS
index e9a88e3885..9be39c3d87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2011, PHP 5.4.0 RC1
+
 20 Oct 2011, PHP 5.4.0 beta2
 - General improvements:
   . Improve the warning message of incompatible arguments. (Laruence) 
diff --git a/configure.in b/configure.in
index edaf2d40d4..16a3f81ded 100644
--- 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="beta2"
+PHP_EXTRA_VERSION="RC1-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 4c51d70fdf..d6431d0296 100644
--- 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 "beta2"
-#define PHP_VERSION "5.4.0beta2"
+#define PHP_EXTRA_VERSION "RC1-dev"
+#define PHP_VERSION "5.4.0RC1-dev"
 #define PHP_VERSION_ID 50400