pooka 986a1e50c3 merge conflicts from 4.06 import

2003-10-27 16:22:35 +00:00

..

magdir

merge conflicts from 4.06 import

2003-10-27 16:22:35 +00:00

Header

…

Localstuff

…

magic2mime

…

magic.mime

file 4.06

2003-10-27 16:14:00 +00:00

Makefile.am

file 4.06

2003-10-27 16:14:00 +00:00

Makefile.in

merge conflicts from 4.06 import

2003-10-27 16:22:35 +00:00