diff options
author | Ferenc Kovacs <tyrael@php.net> | 2014-09-24 09:41:02 +0200 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2014-09-24 09:41:02 +0200 |
commit | 7134f19ba26f701532f5ffbfedd91bd92f038947 (patch) | |
tree | 3cfa652f2c99cdce62c8a849592654b8731d329c /sapi/apache_hooks/php_apache.c | |
parent | 9972446b2a8acd7c786a0bdcf93956a4902f83be (diff) | |
parent | 213d9ee62d941c6f8d008d4efc481c809ac4b942 (diff) | |
download | php-git-7134f19ba26f701532f5ffbfedd91bd92f038947.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
the order of the blocks should be Core, then exts in alphabetical order
add missing NEWS entry for the phpdbg compilation fix
Diffstat (limited to 'sapi/apache_hooks/php_apache.c')
0 files changed, 0 insertions, 0 deletions