]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37a2f3f a26748d)
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 14 Jul 2016 18:46:01 +0000 (20:46 +0200)
committerNikita Popov <nikic@php.net>
Thu, 14 Jul 2016 18:46:01 +0000 (20:46 +0200)
Conflicts:
Zend/zend_vm_execute.h


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