]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2f8c9c d2765e4)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 27 May 2014 20:38:02 +0000 (22:38 +0200)
committerAnatol Belski <ab@php.net>
Tue, 27 May 2014 20:38:02 +0000 (22:38 +0200)
* PHP-5.4:
  updated libmagic.patch for 5.4+

Conflicts:
ext/fileinfo/libmagic.patch


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.