]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f2b0e6 ba1c78c)
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Tue, 5 May 2015 03:07:02 +0000 (11:07 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 5 May 2015 03:07:02 +0000 (11:07 +0800)
Conflicts:
ext/opcache/ZendAccelerator.h


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