]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e769025 10367fa)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Sun, 7 Apr 2013 20:18:53 +0000 (22:18 +0200)
committerAnatol Belski <ab@php.net>
Sun, 7 Apr 2013 20:18:53 +0000 (22:18 +0200)
* PHP-5.4:
  upgraded libmagic to 5.14

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

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