summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-06-11 10:21:26 +0200
committerJulien Pauli <jpauli@php.net>2014-06-11 10:21:26 +0200
commita6e07510792255aab0cd39c01595d16f9da80a05 (patch)
treef015194cf3d366d6da0d629fe45462609675d28e
parent495e6719e0512fca83bb832a9632a567e8a11241 (diff)
downloadphp-git-a6e07510792255aab0cd39c01595d16f9da80a05.tar.gz
5.5.15 now
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 771f04d47c..a5c13710fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2014, PHP 5.5.15
+
?? ??? 2014, PHP 5.5.14
- Core:
diff --git a/configure.in b/configure.in
index b0937cac2c..37310cdc6b 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=14
+PHP_RELEASE_VERSION=15
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 2a2464c8c4..6f65548d01 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 14
+#define PHP_RELEASE_VERSION 15
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.14-dev"
-#define PHP_VERSION_ID 50514
+#define PHP_VERSION "5.5.15-dev"
+#define PHP_VERSION_ID 50515