summaryrefslogtreecommitdiff
path: root/Zend/zend_inheritance.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-10-27 13:19:33 +0100
committerBob Weinand <bobwei9@hotmail.com>2014-10-27 13:19:33 +0100
commita3ae40152490eacdced73408b9978c8ba31d0179 (patch)
tree8843a1281853e282671797488c9d80caf337542b /Zend/zend_inheritance.c
parent2233625e02374339a7d10876b353c158fa39a5f9 (diff)
parent6eab2b910120e0ff5f0cdbbeac9be02e13312497 (diff)
downloadphp-git-a3ae40152490eacdced73408b9978c8ba31d0179.tar.gz
Merge remote-tracking branch 'origin/PHP-5.6'
Diffstat (limited to 'Zend/zend_inheritance.c')
0 files changed, 0 insertions, 0 deletions