summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/php_functions.c
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2014-12-05 13:57:46 -0800
committerAdam Harvey <aharvey@php.net>2014-12-05 13:57:46 -0800
commit79131b46176d136743274f802cfc87418c4294db (patch)
tree005b4ce5bfe5523e7ed324246087836da6a37eba /sapi/apache2handler/php_functions.c
parent3add3491b3c0d48aa5278163664e5dc66c024419 (diff)
parent0e985d372692e13b9b777b5eae5572e028f1d96a (diff)
downloadphp-git-79131b46176d136743274f802cfc87418c4294db.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Revert unintentional docblock change
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions