summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavey Shafik <me@daveyshafik.com>2016-08-05 11:07:15 -0700
committerDavey Shafik <me@daveyshafik.com>2016-08-05 11:07:15 -0700
commita8ab3b4f0ebede8268353e480169f8b9ff371d63 (patch)
tree5e3c3d43a1bddf9fa5d14b1033e39db4f91bbcef
parent050a5d5662fa5cb4590efbb2b412957ad9e7f311 (diff)
downloadphp-git-a8ab3b4f0ebede8268353e480169f8b9ff371d63.tar.gz
Revert "Update versions/dates for PHP 7.1.0beta2"
This reverts commit 050a5d5662fa5cb4590efbb2b412957ad9e7f311.
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index c7bccfa347..eaec429a40 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-04 Aug 2016, PHP 7.1.0beta2
+?? ??? 2016, PHP 7.1.0beta2
- Core:
. Implemented FR #72614 (Support "nmake test" on building extensions by
diff --git a/configure.in b/configure.in
index f3b2cd2170..a35f413dad 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=1
PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION=beta2
+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 dab1598b73..4714e5dc4b 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 7
#define PHP_MINOR_VERSION 1
#define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "beta2"
-#define PHP_VERSION "7.1.0beta2"
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "7.1.0-dev"
#define PHP_VERSION_ID 70100