[ViewVC] Revision 11116 of: src

Jump to revision:
Author:	laffer1
Date:	Tue Jun 19 19:07:27 2018 UTC (5 years, 11 months ago)
Log Message:	fix merge issue

Changed paths

Path	Details
trunk/contrib/file/Makefile.am	added
trunk/contrib/file/Makefile.in	added
trunk/contrib/file/config.guess	added
trunk/contrib/file/config.sub	added
trunk/contrib/file/depcomp	added
trunk/contrib/file/doc/	added
trunk/contrib/file/doc/Makefile.am	added
trunk/contrib/file/doc/Makefile.in	added
trunk/contrib/file/doc/file.man	added
trunk/contrib/file/doc/libmagic.man	added
trunk/contrib/file/doc/magic.man	added
trunk/contrib/file/ltmain.sh	added
trunk/contrib/file/magic/Header	added
trunk/contrib/file/magic/Localstuff	added
trunk/contrib/file/magic/Magdir/algol68	added
trunk/contrib/file/magic/Magdir/apache	added
trunk/contrib/file/magic/Magdir/application	added
trunk/contrib/file/magic/Magdir/apt	added
trunk/contrib/file/magic/Magdir/ber	added
trunk/contrib/file/magic/Magdir/bhl	added
trunk/contrib/file/magic/Magdir/bioinformatics	added
trunk/contrib/file/magic/Magdir/cbor	added
trunk/contrib/file/magic/Magdir/coff	added
trunk/contrib/file/magic/Magdir/coverage	added
trunk/contrib/file/magic/Magdir/der	added
trunk/contrib/file/magic/Magdir/finger	added
trunk/contrib/file/magic/Magdir/flif	added
trunk/contrib/file/magic/Magdir/gconv	added
trunk/contrib/file/magic/Magdir/gpu	added
trunk/contrib/file/magic/Magdir/kerberos	added
trunk/contrib/file/magic/Magdir/meteorological	added
trunk/contrib/file/magic/Magdir/microfocus	added
trunk/contrib/file/magic/Magdir/nasa	added
trunk/contrib/file/magic/Magdir/pc88	added
trunk/contrib/file/magic/Magdir/pc98	added
trunk/contrib/file/magic/Magdir/polyml	added
trunk/contrib/file/magic/Magdir/psl	added
trunk/contrib/file/magic/Magdir/qt	added