]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8705254 5b90a8b)
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Tue, 21 Jun 2016 07:28:17 +0000 (00:28 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 21 Jun 2016 07:28:17 +0000 (00:28 -0700)
* PHP-5.6:
  Now the right bug #
  Fix NEWS

Conflicts:
configure.in
main/php_version.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.