diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-15 17:15:21 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-15 17:15:21 -0700 |
| commit | 6bf7c10b208b88848a8eeed17caa3e2ae4f09f77 (patch) | |
| tree | 20c00dad447c117ba2421feeeadc3ac5898ce9e0 /sapi/cli/php_cli_server.c | |
| parent | b8d029435dd436487a455a758e8dc10d1c94096e (diff) | |
| parent | 1d34d822315a97bb7d3eeb3b9e75f34807ac4a12 (diff) | |
| download | php-git-6bf7c10b208b88848a8eeed17caa3e2ae4f09f77.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.29 is next
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions