diff options
| author | Anatol Belski <ab@php.net> | 2014-05-27 22:38:02 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-05-28 10:03:24 +0200 |
| commit | cddf2c5dcd5ee23bd175826889d25de52c97b119 (patch) | |
| tree | c81196261acadc678ef64b038da9a8e129803eda /sapi/apache2handler/php_functions.c | |
| parent | 8a904ba8a5bd3b0c3feda1dfed6fd3b3072e5af6 (diff) | |
| download | php-git-cddf2c5dcd5ee23bd175826889d25de52c97b119.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch for 5.4+
Conflicts:
ext/fileinfo/libmagic.patch
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions