com php-src: bump versions to stable: configure.in main/php_v ersion.h
| From: | Ferenc Kovacs | Date: | Wed, 27 Aug 2014 03:00:14 +0000 |
| Subject: | com php-src: bump versions to stable: configure.in main/php_v ersion.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81173@lists.php.net to get a copy of this message | ||
Commit: 5a1ff3bf50d22555a69d8e172e93dd0995c72040
Author: Ferenc Kovacs <tyrael@php.net> Wed, 27 Aug 2014 05:00:14 +0200
Parents: b0cb9341bd847202acde1a700f76f7888c209497
Branches: PHP-5.6.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5a1ff3bf50d22555a69d8e172e93dd0995c72040
Log:
bump versions to stable
Changed paths:
M configure.in
M main/php_version.h
Diff:
diff --git a/configure.in b/configure.in
index 7df1c94..1037b71 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="RC4"
+PHP_EXTRA_VERSION=""
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 d734318..90dfd76 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 "RC4"
-#define PHP_VERSION "5.6.0RC4"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.0"
#define PHP_VERSION_ID 50600