summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-11-11 16:31:38 -0800
committerStanislav Malyshev <stas@php.net>2014-11-11 16:31:38 -0800
commit98b22864ff697b84e29c270c187fb316acf8e478 (patch)
treea8db1ea999cf066261b80a8e9196e7cf93554866
parent2323e95df92e8e11b0afde86e7a3b5055031bda8 (diff)
downloadphp-git-98b22864ff697b84e29c270c187fb316acf8e478.tar.gz
5.4.36-dev
-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 2b9e544aad..7ea06aa7b6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 20?? PHP 5.4.36
+
13 Nov 2014 PHP 5.4.35
- Core:
diff --git a/configure.in b/configure.in
index 91ae7fce91..8a14b49805 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=4
-PHP_RELEASE_VERSION=35
+PHP_RELEASE_VERSION=36
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 a3e2cfc31f..a36ea89436 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,8 +2,8 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 35
+#define PHP_RELEASE_VERSION 36
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.35-dev"
-#define PHP_VERSION_ID 50435
+#define PHP_VERSION "5.4.36-dev"
+#define PHP_VERSION_ID 50436