summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorunknown <pajoye@php.net>2013-09-09 11:56:58 +0200
committerunknown <pajoye@php.net>2013-09-09 11:56:58 +0200
commitd32194172ad6dba22378609324b6d3ae2bcff41c (patch)
treeb59707027f30621a777bc49c6c0681718677bb87 /sapi/cli/php_cli_server.c
parentdf711f2c56c74609ec5865fab5fee247b175c654 (diff)
parentb54b6e30a4e46d9dd1f1bf0cbc0d4539c0f7d51d (diff)
downloadphp-git-d32194172ad6dba22378609324b6d3ae2bcff41c.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: ensure that the defined interpolation method is used by the generic scaling functions
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions