summaryrefslogtreecommitdiff
path: root/main/php_version.h
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-03-25 13:05:08 +0800
committerXinchen Hui <laruence@php.net>2015-03-25 13:05:08 +0800
commitfe0ca2745f00940a27bfc8e87db534541a19af70 (patch)
tree9f6ecb6d7dd517f46f71bfc12cdeebd17f8fc904 /main/php_version.h
parentef2db26c60537e84b502608ff404263d5f4dc5d2 (diff)
parent968fbc6acf0bc27be17c0209be7f966e89a55943 (diff)
downloadphp-git-fe0ca2745f00940a27bfc8e87db534541a19af70.tar.gz
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Diffstat (limited to 'main/php_version.h')
-rw-r--r--main/php_version.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/main/php_version.h b/main/php_version.h
index c6aa024436..44f5a70afe 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,8 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 32
-
+#define PHP_RELEASE_VERSION 40
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.32-dev"
-#define PHP_VERSION_ID 50432
+#define PHP_VERSION "5.4.40-dev"
+#define PHP_VERSION_ID 50440