php-src/ext/fileinfo/data_file.c
Andrey Hristov 3dc9bef819 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
2014-08-06 16:25:12 +03:00

16 MiB

The file is too large to be shown. View Raw