diff options
| author | Xinchen Hui <laruence@php.net> | 2013-06-09 13:49:26 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-06-09 13:49:26 +0800 |
| commit | f372e00332c06f0e659dd755ecf7ca8e920dee42 (patch) | |
| tree | 749e1d8777bfceffb674098efa773d9a7e16ba93 /main/php_ini.c | |
| parent | bccacb630858f28370acbf014c8514709e3d689a (diff) | |
| parent | 3cc891bf3a27eb13a101da3391b75cfa77a117ae (diff) | |
| download | php-git-f372e00332c06f0e659dd755ecf7ca8e920dee42.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_vm_def.h
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions