Commit:    46ee57f2d77671bdb13819f71b43b60ca571221b
Author:    Johannes Schlüter <johan...@php.net>         Thu, 28 Mar 2013 
15:05:46 +0100
Parents:   c4686b4de93a89e8265331b0d4a6a7954ccbae95
Branches:  PHP-5.3

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=46ee57f2d77671bdb13819f71b43b60ca571221b

Log:
This will PHP 5.3.25

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index 9d5fc6d..18fe3e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,15 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2013, PHP 5.3.25
+
+
+
 ?? ??? 2013, PHP 5.3.24
 
+##
+## Add NEWS entries to 5.3.25 above, RM will merge and update NEWS if needed
+##
+
 - Core
   . Fixed bug #64370 (microtime(true) less than 
$_SERVER['REQUEST_TIME_FLOAT']).
     (Anatol)
diff --git a/configure.in b/configure.in
index f49e195..ea57f74 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=24
+PHP_RELEASE_VERSION=25
 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 10e5b7d..8ac4945 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 3
-#define PHP_RELEASE_VERSION 24
+#define PHP_RELEASE_VERSION 25
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.24-dev"
-#define PHP_VERSION_ID 50324
+#define PHP_VERSION "5.3.25-dev"
+#define PHP_VERSION_ID 50325


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to