diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-21 05:03:20 -0800 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-11-21 18:27:43 +0100 |
| commit | 7d2a26b3fd90fb8ef8ab5d1a7134c370f3be0a78 (patch) | |
| tree | ad84ae82f90a788d8c4d6620aa2a964c87dcb9eb /Zend/zend_exceptions.c | |
| parent | e4d1ac2c0f9dd0ac0789fe6afff0e3f97dae3bc6 (diff) | |
| download | php-git-7d2a26b3fd90fb8ef8ab5d1a7134c370f3be0a78.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/tests/bug70944.phpt
Zend/zend_exceptions.c
Diffstat (limited to 'Zend/zend_exceptions.c')
0 files changed, 0 insertions, 0 deletions