summaryrefslogtreecommitdiff
path: root/main/php_version.h
diff options
context:
space:
mode:
authorDerick Rethans <github@derickrethans.nl>2014-01-02 10:57:46 +0000
committerDerick Rethans <github@derickrethans.nl>2014-01-02 10:57:46 +0000
commitdee77f237c7989359986f5020d450c1b9a93464c (patch)
tree0b8de5050f07364b3fcb03fa420686505947dc79 /main/php_version.h
parente881334e496be92ac6d1751f25d006203f3229d6 (diff)
parent3c3ff434329d2f505b00a79bacfdef95ca96f0d2 (diff)
downloadphp-git-dee77f237c7989359986f5020d450c1b9a93464c.tar.gz
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Diffstat (limited to 'main/php_version.h')
-rw-r--r--main/php_version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/php_version.h b/main/php_version.h
index 89fb515acc..213cd5386d 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 4
-#define PHP_RELEASE_VERSION 24
+#define PHP_RELEASE_VERSION 25
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.24-dev"
-#define PHP_VERSION_ID 50424
+#define PHP_VERSION "5.4.25-dev"
+#define PHP_VERSION_ID 50425