]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd26419 03fa550)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 17:33:54 +0000 (19:33 +0200)
committerAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 17:33:54 +0000 (19:33 +0200)
* PHP-5.5:
  Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
ext/fileinfo/libmagic/readcdf.c

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

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