christos 04eef3cfd2 resolve conflicts, fix build.		2008-08-30 12:16:51 +00:00
..
magdir	resolve conflicts, fix build.	2008-08-30 12:16:51 +00:00
Header
Localstuff	file 4.20, contains fixes to the magic parser, new syntax and a	2007-03-04 14:54:42 +00:00
Makefile.am	resolve conflicts, fix build.	2008-08-30 12:16:51 +00:00
Makefile.in	resolve conflicts, fix build.	2008-08-30 12:16:51 +00:00