com php-src: Merge branch 'PHP-5.6': main/php_version.h
| From: | Anatol Belski | Date: | Thu, 11 Sep 2014 21:33:12 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': main/php_version.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81514@lists.php.net to get a copy of this message | ||
Commit: 0292c34b05663be32e623d1e1b65834186d481ee
Author: Anatol Belski <ab@php.net> Thu, 11 Sep 2014 23:33:12 +0200
Parents: 8527657ca65ee6633055b88f10f63cf96e14c2d0 13280a9e36174c02aa923647fbf9a38a1a5182d3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0292c34b05663be32e623d1e1b65834186d481ee
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
5.6.2 now
Conflicts:
configure.in
main/php_version.h
Changed paths:
MM main/php_version.h
Diff:
diff --cc main/php_version.h
index d48ab24,1cd646e..186d9d2
--- a/main/php_version.h
+++ b/main/php_version.h
@@@ -1,8 -1,8 +1,9 @@@
/* automatically generated by configure */
/* edit configure.in to change version number */
-#define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 6
-#define PHP_RELEASE_VERSION 2
+#define PHP_MAJOR_VERSION 7
+#define PHP_MINOR_VERSION 0
+#define PHP_RELEASE_VERSION 0
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.2-dev"
-#define PHP_VERSION_ID 50602
+#define PHP_VERSION "7.0.0-dev"
+#define PHP_VERSION_ID 70000
++