com php-src: Revert "5.6.0alpha1": NEWS configure.in main/php_version.h

Commit: 1f148f7ad99e78476ff20ef47c09082ae2861bc4 Author: Ferenc Kovacs <tyrael@php.net> Thu, 6 Feb 2014 03:55:53 +0100 Parents: 8648f76bac2f78391a1539253f21d62f53d83022 Branches: PHP-5.6.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f148f7ad99e78476ff20ef47c09082ae2861bc4 Log: Revert "5.6.0alpha1" This reverts commit 8648f76bac2f78391a1539253f21d62f53d83022. Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 28ab2ba..8629c51 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -23 Jan 2014, PHP 5.6.0 Alpha 1 +?? ??? 20??, PHP 5.6.0 - CLI server: . Added some MIME types to the CLI web server. (Chris Jones) diff --git a/configure.in b/configure.in index 5843023..3369b9a 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=6 PHP_RELEASE_VERSION=0 -PHP_EXTRA_VERSION="alpha1" +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 8ee8939..d48bf13 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 6 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "alpha1" -#define PHP_VERSION "5.6.0alpha1" +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.6.0-dev" #define PHP_VERSION_ID 50600