diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-10-04 02:37:04 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-10-04 02:37:04 +0200 |
| commit | 5bbc489527d9a762fa98cffb353f007d60090a3c (patch) | |
| tree | b3bf9d9d23dc26ce10deaeef2b93f1f24dd6f3eb /sapi/cli/php_cli_server.c | |
| parent | 26e492f2f3d3e26f7320957172e37ee49f6e6112 (diff) | |
| parent | 64c09f68ec66061d1085ad5a5ef0a5ced63450b6 (diff) | |
| download | php-git-5bbc489527d9a762fa98cffb353f007d60090a3c.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions