]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8527657 13280a9)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 11 Sep 2014 21:33:12 +0000 (23:33 +0200)
committerAnatol Belski <ab@php.net>
Thu, 11 Sep 2014 21:33:12 +0000 (23:33 +0200)
commit0292c34b05663be32e623d1e1b65834186d481ee
treeef20e33a28a148ed9739ff16322a0547e6e8ab25tree | snapshot
parent8527657ca65ee6633055b88f10f63cf96e14c2d0commit | diff
parent13280a9e36174c02aa923647fbf9a38a1a5182d3commit | diff
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
main/php_version.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.