diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-30 20:45:10 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-30 20:45:10 +0200 |
| commit | c59292570cd6dc8ba83de305526becd70e3db992 (patch) | |
| tree | 89fb4c8c5e967a6d2f27ad5766af41187309056d /main/php.h | |
| parent | 3aea1dca06737acff3d5ec460aa1e68b770bf1b5 (diff) | |
| parent | d7368c2531ad1268d43c894b8422a61b70c70e5a (diff) | |
| download | php-git-c59292570cd6dc8ba83de305526becd70e3db992.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions