summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2011-01-05 14:50:13 +0000
committerIlia Alshanetsky <iliaa@php.net>2011-01-05 14:50:13 +0000
commit921abf906ac7b41aafe364995febb1b332c343fc (patch)
tree21deb63c97579a2be7f711179c2964e01a9b8cb4
parent17f4cf457e217c2b46f57538fbd0af68838afe43 (diff)
downloadphp-git-921abf906ac7b41aafe364995febb1b332c343fc.tar.gz
Back to dev
-rw-r--r--NEWS2
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h8
3 files changed, 8 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 27059eb9d0..d4a0dfff5c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? ????, PHP 5.2.18
+
06 Jan 2010, PHP 5.2.17
- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)
diff --git a/configure.in b/configure.in
index 8ebe91cfd4..5af0c1141c 100644
--- a/configure.in
+++ b/configure.in
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=17
-PHP_EXTRA_VERSION=""
+PHP_RELEASE_VERSION=18
+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 b07fdf4260..851d0e13f8 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 2
-#define PHP_RELEASE_VERSION 17
-#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.2.17"
-#define PHP_VERSION_ID 50217
+#define PHP_RELEASE_VERSION 18
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.2.18-dev"
+#define PHP_VERSION_ID 50218