diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-20 17:48:06 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-20 17:48:06 +0100 |
| commit | 12f2665df829eac53e2036e335b40cf391ff8652 (patch) | |
| tree | 7e5aaf6a5a19415a7a416ff6aa36b02f80a5d66c /Zend/zend_builtin_functions.c | |
| parent | a175aa9dcaed5e295d015ff73c663e06c2335155 (diff) | |
| parent | cc3cdd00578006a5684e6dfaf81532a13326b9fe (diff) | |
| download | php-git-12f2665df829eac53e2036e335b40cf391ff8652.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/spl/spl_observer.c
Diffstat (limited to 'Zend/zend_builtin_functions.c')
0 files changed, 0 insertions, 0 deletions