christos 04eef3cfd2 resolve conflicts, fix build.		2008-08-30 12:16:51 +00:00
..
file.1	resolve conflicts, fix build.	2008-08-30 12:16:51 +00:00
file.man
libmagic.3	resolve conflicts, fix build.	2008-08-30 12:16:51 +00:00
libmagic.man
magic.5	resolve conflicts	2008-08-30 11:39:01 +00:00
magic.man
Makefile.am
Makefile.in	resolve conflicts	2008-08-30 11:39:01 +00:00