diff options
author | Dmitry Stogov <dmitry@zend.com> | 2013-08-29 10:32:21 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2013-08-29 10:32:21 +0400 |
commit | 632f733ce4d31f7a46e1d70b9454dcb12a98b089 (patch) | |
tree | 1646d20cdc83482f214aacdd49e8446163196838 /sapi/cli/php_cli_server.c | |
parent | 790db9ff9b95d9dfaf6720593517dc0368f1fe7f (diff) | |
parent | e356d790cccc309acf870dc22be7d00edaed8261 (diff) | |
download | php-git-632f733ce4d31f7a46e1d70b9454dcb12a98b089.tar.gz |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions