diff options
| author | Anatol Belski <ab@php.net> | 2014-12-16 17:13:47 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-16 17:13:47 +0100 |
| commit | 2eef2abee5e89e77c88a9c5732bc95fab27d3404 (patch) | |
| tree | 1105a2fad11f1f8c042d987a963bccbf230c2f44 /main/php_main.h | |
| parent | 5ea8c3cefcad45ca5c6e1ba7df8ac5283f7da2a4 (diff) | |
| parent | 3a18597774d4b63a134db0c38235be9fa72f9560 (diff) | |
| download | php-git-2eef2abee5e89e77c88a9c5732bc95fab27d3404.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Optimize argument passing handlers:
Fix pcre non-FAST_ZPP build
Conflicts:
Zend/zend_compile.c
Zend/zend_execute.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/pcre/php_pcre.c
Diffstat (limited to 'main/php_main.h')
0 files changed, 0 insertions, 0 deletions