pooka 90651bdae0 there is no conflict, you are receding		2003-05-25 21:46:09 +00:00
..
magdir	there is no conflict, you are receding	2003-05-25 21:46:09 +00:00
Header	file 4.00	2003-03-25 22:29:42 +00:00
Localstuff	file 4.00	2003-03-25 22:29:42 +00:00
Makefile.am	file 4.03	2003-05-25 21:26:39 +00:00
Makefile.in	there is no conflict, you are receding	2003-05-25 21:46:09 +00:00
magic.mime	file 4.03	2003-05-25 21:26:39 +00:00
magic2mime	file 4.00	2003-03-25 22:29:42 +00:00