]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23c7f19 7e9a1c1)
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Mon, 6 Apr 2015 20:09:22 +0000 (22:09 +0200)
committerNikita Popov <nikic@php.net>
Mon, 6 Apr 2015 20:09:22 +0000 (22:09 +0200)
Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_language_parser.y


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