]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Fri, 18 Jul 2014 07:48:56 +0000 (15:48 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 18 Jul 2014 07:48:56 +0000 (15:48 +0800)
commit550b3e4306124fbf65602c7e3a99653427ed8c8d
tree02bece5c0452896af68466d508b49cc2d4214820
parent84673485f5b3134e357f6ec90bbaab9ffec11a68
parentba1cf321f301410cc5b3da61e106040187f1787b
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_compile.h
Zend/zend_opcode.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h