diff options
| author | Andrey Hristov <andrey@php.net> | 2014-04-14 17:44:13 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-04-14 17:44:13 +0300 |
| commit | ce99f292de4f98a189be014716717aa1ca89f492 (patch) | |
| tree | aa493b6ed4f9e5dc1c7a1036bfb3a58fc7418b48 /sapi/cli/php_cli_server.c | |
| parent | d483e1dacad1d274aa7fbd681fc802b83cb67b39 (diff) | |
| parent | dae70a2ff76ff847b59d00ef75070afacdfa2208 (diff) | |
| download | php-git-ce99f292de4f98a189be014716717aa1ca89f492.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/mysqli/tests/mysqli_change_user_old.phpt
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions