]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 138689f 562c17e)
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Wed, 3 Aug 2016 23:42:00 +0000 (01:42 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Wed, 3 Aug 2016 23:42:00 +0000 (01:42 +0200)
Conflicts:
configure.in
main/php_version.h


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