diff options
| author | Anatol Belski <ab@php.net> | 2015-01-04 09:42:46 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-04 09:42:46 +0100 |
| commit | c06f66563adaba30f5577add7a4a50bbe24c29e6 (patch) | |
| tree | 3433c11adbd4871613556a501547f3d0eecfe972 /sapi/apache_hooks/php_apache_http.h | |
| parent | fe46966678db3b82b66b715d37c6254d81dbe568 (diff) | |
| parent | b644dcfb72ddc436d626ad043b7c96b602de2d55 (diff) | |
| download | php-git-c06f66563adaba30f5577add7a4a50bbe24c29e6.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
removed dead code
Conflicts:
ext/fileinfo/libmagic/readelf.c
ext/fileinfo/libmagic/readelf.h
Diffstat (limited to 'sapi/apache_hooks/php_apache_http.h')
0 files changed, 0 insertions, 0 deletions