summaryrefslogtreecommitdiff
path: root/Zend/tests
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-02-20 19:00:36 +0100
committerAnatol Belski <ab@php.net>2014-02-20 19:00:36 +0100
commite244e2245b9705329d92b92fb0d0d0f50d5af9a4 (patch)
treed0182bcdbae5142016b704752800eda8d6d045d2 /Zend/tests
parent6d4d4155d26f8725365ee24797ecd14cba049a53 (diff)
parentce1fd72776292dd81c0e39d470631d9a3f62ddb6 (diff)
downloadphp-git-e244e2245b9705329d92b92fb0d0d0f50d5af9a4.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: updated libmagic.patch in 5.4/5
Diffstat (limited to 'Zend/tests')
0 files changed, 0 insertions, 0 deletions