Xinchen Hui 91b2ddc816 Merge branch 'master' into phpng ... Conflicts: ext/spl/spl_array.c ext/spl/spl_directory.c ext/standard/formatted_print.c		2014-06-01 22:43:06 +08:00
..
libmagic	Merge branch 'master' into phpng	2014-06-01 22:43:06 +08:00
tests	Merge branch 'PHP-5.5' into PHP-5.6	2014-04-24 19:33:54 +02:00
config.m4	Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute	2014-04-15 10:26:49 -07:00
config.w32	Backported the fix for bug #63248 from 5.4+	2012-11-23 13:58:22 +01:00
create_data_file.php	This commit was manufactured by cvs2svn to create branch 'PHP_5_3'.	2008-07-25 02:44:58 +00:00
CREDITS	- fix the build for win (vc6 or vc9)	2009-03-16 15:03:06 +00:00
data_file.c	fix merge issue	2014-03-25 12:07:15 +01:00
EXPERIMENTAL	This commit was manufactured by cvs2svn to create branch 'PHP_5_3'.	2007-09-26 15:44:16 +00:00
fileinfo.c	Refactor fileinfo	2014-05-07 13:50:29 +08:00
fileinfo.php	This commit was manufactured by cvs2svn to create branch 'PHP_5_3'.	2007-09-26 15:44:16 +00:00
libmagic.patch	updated libmagic.patch for 5.6+	2014-05-27 22:39:54 +02:00
magicdata.patch	Fix merge (5.6 already have file 5.17)	2014-03-25 11:03:59 +01:00
Makefile.frag	MFH: enable fileinfo by default	2008-07-25 09:16:22 +00:00
package.xml	This commit was manufactured by cvs2svn to create branch 'PHP_5_3'.	2007-09-26 15:44:16 +00:00
php_fileinfo.h	Set fileinfo version to 1.0.5 (as in php 5.4, no diff)	2014-02-18 13:57:53 +01:00