summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_parser.c
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2014-06-27 09:51:15 +0200
committerRemi Collet <remi@php.net>2014-06-27 09:51:15 +0200
commit37aa57cd1b40029844381e22ae8ab5664a4c5482 (patch)
tree3eff125f677d94ebb6eb625d39f2bdcded5c4fc9 /sapi/phpdbg/phpdbg_parser.c
parent1255aa9130383721504a5489dd3864e903852654 (diff)
parent6c72ea87fd5c1155f31bea75c1711e0143bb6447 (diff)
downloadphp-git-37aa57cd1b40029844381e22ae8ab5664a4c5482.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: NEWS NEWS Fix Bug #67531 syslog cannot be set in pool configuration Fix Bug #67530 error_log=syslog ignored
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.c')
0 files changed, 0 insertions, 0 deletions