diff options
| author | Xinchen Hui <laruence@php.net> | 2013-06-09 14:25:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-06-09 14:25:53 +0800 |
| commit | b839e6921da08adf1d8413cea5c2a21da069e23e (patch) | |
| tree | 4a3dd404c48b69ff581acfe3b92bc34c20593137 /main/php_ini.c | |
| parent | 6139358804ce41df3bbe54a7e8df6c6eb303c8b6 (diff) | |
| parent | e14800dd46ce9adbaa696fec6b2f1741bbc3abba (diff) | |
| download | php-git-b839e6921da08adf1d8413cea5c2a21da069e23e.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