diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2016-06-09 10:52:26 +0200 | 
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2016-06-09 10:52:26 +0200 | 
| commit | 65b6950a56cb19635cf533ff7f7efa2acc918d43 (patch) | |
| tree | e8000a701d45a060bdbaf04d1fc6bafea52e7dd0 /Zend/zend_inheritance.h | |
| parent | 84dce33b048ff78872664bc8bf2535ee87c88446 (diff) | |
| parent | c26097c2f19bac7b085b45271dc27ad683f33aa2 (diff) | |
| download | php-git-65b6950a56cb19635cf533ff7f7efa2acc918d43.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  5.6.24 will be next
Diffstat (limited to 'Zend/zend_inheritance.h')
0 files changed, 0 insertions, 0 deletions
