grant f7ddfc3676 add additional StuffIt format.		2002-07-15 06:07:16 +00:00
..
acorn	file 3.38	2002-05-18 06:45:50 +00:00
adi	…
adventure	file 3.38	2002-05-18 06:45:50 +00:00
allegro	…
alliant	…
alpha	…
amanda	…
amigaos	conflict therapy	2002-05-18 07:00:44 +00:00
animation	conflict therapy	2002-05-18 07:00:44 +00:00
apl	…
apple	resolve conflicts	2001-07-22 22:53:00 +00:00
applix	…
archive	end this destructive conflict	2002-07-09 14:59:52 +00:00
asterix	…
att3b	…
audio	Yamaha TX Wave	2002-07-10 09:02:22 +00:00
blender	…
blit	…
bsdi	…
c-lang	…
cddb	file 3.39	2002-07-09 14:47:21 +00:00
chi	…
cisco	…
citrus	oops, this was actually a new file, not an old file that is dead	2001-07-22 23:34:22 +00:00
claris	…
clipper	…
commands	conflict therapy	2002-05-18 07:00:44 +00:00
compress	conflict therapy	2002-05-18 07:00:44 +00:00
console	…
convex	…
ctags	…
cvs	file 3.38	2002-05-18 06:45:50 +00:00
database	end this destructive conflict	2002-07-09 14:59:52 +00:00
diamond	…
diff	…
digital	…
dolby	file 3.38	2002-05-18 06:45:50 +00:00
dump	…
dyadic	…
editors	file 3.38	2002-05-18 06:45:50 +00:00
elf	conflict therapy	2002-05-18 07:00:44 +00:00
encore	…
epoc	…
filesystems	end this destructive conflict	2002-07-09 14:59:52 +00:00
flash	…
fonts	…
frame	…
freebsd	resolve conflicts	2001-07-22 22:53:00 +00:00
fsav	…
gimp	…
gnu	…
grace	…
gringotts	file 3.38	2002-05-18 06:45:50 +00:00
hitachi-sh	invert the meanings of the F_LSYMS field.	2001-08-14 21:26:54 +00:00
hp	…
human68k	file(1) magic for Human68k (X680x0 DOS) binary formats	2002-05-21 07:59:16 +00:00
ibm370	…
ibm6000	…
iff	…
images	conflict therapy	2002-05-18 07:00:44 +00:00
intel	…
interleaf	…
island	…
ispell	…
java	…
jpeg	resolve conflicts	2001-07-22 22:53:00 +00:00
karma	…
lecter	…
lex	…
lif	…
linux	end this destructive conflict	2002-07-09 14:59:52 +00:00
lisp	conflict therapy	2002-05-18 07:00:44 +00:00
mach	…
macintosh	add additional StuffIt format.	2002-07-15 06:07:16 +00:00
magic	resolve conflicts	2001-07-22 22:53:00 +00:00
mail.news	resolve conflicts	2001-07-22 22:53:00 +00:00
maple	…
mathematica	…
mcrypt	file 3.38	2002-05-18 06:45:50 +00:00
mime	…
mips	mips-magic is back	2001-07-22 23:29:55 +00:00
mirage	…
mkid	…
mlssa	Recognise MLSSA datafiles	2001-09-20 03:05:54 +00:00
mmdf	…
modem	…
motorola	resolve conflicts	2001-07-22 22:53:00 +00:00
msdos	resolve conflicts	2001-07-22 22:53:00 +00:00
msvc	…
natinst	file 3.37	2001-09-09 10:38:55 +00:00
ncr	…
netbsd	…
netscape	…
news	…
nitpicker	file 3.38	2002-05-18 06:45:50 +00:00
octave	…
olf	…
os2	…
os9	…
osf1	…
palm	…
parix	…
pbm	…
pdf	…
pdp	…
perl	file 3.38	2002-05-18 06:45:50 +00:00
pgp	…
pkgadd	…
plus5	…
printer	conflict therapy	2002-05-18 07:00:44 +00:00
project	…
psdbms	…
pulsar	file 3.39	2002-07-09 14:47:21 +00:00
pyramid	…
python	…
riff	…
rpm	…
rtf	…
sc	…
sccs	…
sendmail	conflict therapy	2002-05-18 07:00:44 +00:00
sequent	…
sgml	…
sharc	…
sketch	…
smalltalk	file 3.37	2001-09-09 10:38:55 +00:00
sniffer	resolve conflicts	2001-09-09 10:46:36 +00:00
softquad	resolve conflicts	2001-07-22 22:53:00 +00:00
spectrum	…
sun	…
sysex	…
teapot	…
terminfo	…
tex	conflict therapy	2002-05-18 07:00:44 +00:00
tgif	file 3.38	2002-05-18 06:45:50 +00:00
ti-8x	…
timezone	…
troff	…
tuxedo	…
typeset	…
unknown	…
uuencode	…
varied.out	conflict therapy	2002-05-18 07:00:44 +00:00
vax	…
vicar	…
visx	…
vms	…
vmware	…
vorbis	file 3.38	2002-05-18 06:45:50 +00:00
vxl	file 3.38	2002-05-18 06:45:50 +00:00
wordperfect	…
xdelta	…
xenix	…
zilog	…
zyxel	…