]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit74ce9da5dcaa31a50bb2395df6200b191fdc0e41
tree905740bfe1a58512d91410c7a506cce16def0606tree | snapshot
parentcd2641973cbd665301739593a291a1fa78a05578commit | diff
parent03fa5501a84af2bda7d81c732d46d2a68ee0e855commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
ext/fileinfo/libmagic/readcdf.c
ext/fileinfo/libmagic/readcdf.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.