]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65baab7 ed7e6d4)
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Tue, 14 Apr 2015 14:38:09 +0000 (16:38 +0200)
committerNikita Popov <nikic@php.net>
Tue, 14 Apr 2015 14:38:09 +0000 (16:38 +0200)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h


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