summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-04-16 13:43:41 -0700
committerStanislav Malyshev <stas@php.net>2012-04-19 10:45:21 -0700
commit701332ce301f9ea9fa4d40eb945de0c1880dad8a (patch)
treec6b256dbb29dd23b7fcbe3bf208f5b1bb3299518 /main
parent36a556546737c5218cd649c9a5ae8b1a10aa2d49 (diff)
downloadphp-git-701332ce301f9ea9fa4d40eb945de0c1880dad8a.tar.gz
Update to 5.4.2-dev
After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
Diffstat (limited to 'main')
-rw-r--r--main/php_version.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/php_version.h b/main/php_version.h
index b4c616ff54..13478d1756 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 1
-#define PHP_EXTRA_VERSION "RC1-dev"
-#define PHP_VERSION "5.4.1RC1-dev"
-#define PHP_VERSION_ID 50401
+#define PHP_RELEASE_VERSION 2
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.4.2-dev"
+#define PHP_VERSION_ID 50402