com php-src: Prepare 5.5.14: configure.in main/php_version. h
| From: | JulienPauli | Date: | Wed, 25 Jun 2014 13:06:23 +0000 |
| Subject: | com php-src: Prepare 5.5.14: configure.in main/php_version. h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79070@lists.php.net to get a copy of this message | ||
Commit: f444b33ee87d3745c3cea948549ec9ed07c8c9c4
Author: Julien Pauli <jpauli@php.net> Wed, 25 Jun 2014 15:06:23 +0200
Parents: bd4b9f35fff9ed4d8db93371eedbaf921443c377
Branches: PHP-5.5.14
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f444b33ee87d3745c3cea948549ec9ed07c8c9c4
Log:
Prepare 5.5.14
Changed paths:
M configure.in
M main/php_version.h
Diff:
diff --git a/configure.in b/configure.in
index 94c8b2a..e2da55b 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=5
PHP_RELEASE_VERSION=14
-PHP_EXTRA_VERSION="RC1"
+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 f435a2c..5287017 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 5
#define PHP_RELEASE_VERSION 14
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.14RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.14"
#define PHP_VERSION_ID 50514