]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2e8333 43652d3)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:17:14 +0000 (10:17 +0100)
committerAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:17:14 +0000 (10:17 +0100)
* PHP-5.5:
  simplify error handling for dirs as magic

1  2 
ext/fileinfo/libmagic/apprentice.c patch | diff1 | diff2 | blob | history

diff --cc ext/fileinfo/libmagic/apprentice.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.