diff options
author | Anatol Belski <ab@php.net> | 2014-07-11 15:07:22 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-07-11 15:07:22 +0200 |
commit | c79a6a0613303dcced860f0400236997b18eaa65 (patch) | |
tree | e322e33f4804894841e9ce35d81c0cf880e7ef3a /sapi/cli/php_cli_server.c | |
parent | e0d6ed6b21e56cd1705b761713d21c1ebb33b825 (diff) | |
parent | b10ed89dac82f6a688257f6ef6e62417743c1387 (diff) | |
download | php-git-c79a6a0613303dcced860f0400236997b18eaa65.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix makefile in phpize mode
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions