summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/php_functions.c
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-08-27 00:48:26 +0200
committerFerenc Kovacs <tyrael@php.net>2014-08-27 00:48:26 +0200
commit2788a718aa55f8f75e50009a8389b6a0a3796497 (patch)
treec2985515391fe0a4243c87105864cc1c8e1425b4 /sapi/apache2handler/php_functions.c
parent694824f3029ed01d64856b567389e9d6f42d3034 (diff)
parente0a177d6765b314ce5fef4719e77cc6cc60b26bc (diff)
downloadphp-git-2788a718aa55f8f75e50009a8389b6a0a3796497.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: update the GIT-RULES with the 5.6 and the release branches
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions