diff options
| author | Nikita Popov <nikic@php.net> | 2015-10-10 15:00:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-10-10 15:00:41 +0200 |
| commit | c85ad5d0be8a629e9bfeb1235447b0308663abae (patch) | |
| tree | c4eef067e0ea8a487ff2c9d6fd12e82efee07f3e /main/php.h | |
| parent | 4b821f0fc6aade0eb9793a8b4fa3cd28b347ac2f (diff) | |
| parent | d7d01fc9a326fe530df4e067db1df9ec451f4411 (diff) | |
| download | php-git-c85ad5d0be8a629e9bfeb1235447b0308663abae.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_closures.c
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions