From: Anatol Belski <ab@php.net>
Date: Thu, 11 Sep 2014 21:33:12 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~150^2~17^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0292c34b05663be32e623d1e1b65834186d481ee;p=php

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
---

0292c34b05663be32e623d1e1b65834186d481ee
diff --cc main/php_version.h
index d48ab24141,1cd646ed02..186d9d2b7d
--- 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
++