]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 190fbb9 171c759)
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sat, 16 Jul 2016 21:02:34 +0000 (23:02 +0200)
committerNikita Popov <nikic@php.net>
Sat, 16 Jul 2016 21:02:34 +0000 (23:02 +0200)
Conflicts:
Zend/zend_gc.c


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