diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-03-25 15:23:49 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-25 15:23:49 +0400 |
| commit | e9f996c00d5cb6448dac1457dd9dae320c16904f (patch) | |
| tree | 006b588b87a1f4c9cf8421c437c6afb334d9e0e3 /ext/json/php_json.h | |
| parent | 6f560b0487b48d8364a2077b97e661fd5107054e (diff) | |
| parent | c4686b4de93a89e8265331b0d4a6a7954ccbae95 (diff) | |
| download | php-git-e9f996c00d5cb6448dac1457dd9dae320c16904f.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions