diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-04-02 00:07:13 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-04-02 00:07:13 +0200 |
| commit | 9806a37a79f9e858c8ea54899942c9a681b98f29 (patch) | |
| tree | 0b4b5c242a78c6118670c582d21fca9f1e696460 /Zend/zend_inheritance.c | |
| parent | e70e2d8310b58a59dc14fa3336624cb022a5daaa (diff) | |
| parent | 9991b8ecee3d8864abe6c05cec12278db1573767 (diff) | |
| download | php-git-9806a37a79f9e858c8ea54899942c9a681b98f29.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
sigh, can't even copypaste without screwing up
Diffstat (limited to 'Zend/zend_inheritance.c')
0 files changed, 0 insertions, 0 deletions