pooka 59a767d683 resolve conflicts		2001-09-09 10:46:36 +00:00
..
adi	file 3.36	2001-07-22 22:31:55 +00:00
adventure	…
allegro	…
alliant	…
alpha	…
amanda	…
amigaos	seperate -> separate	2001-07-22 13:33:58 +00:00
animation	resolve conflicts	2001-07-22 22:53:00 +00:00
apl	…
apple	resolve conflicts	2001-07-22 22:53:00 +00:00
applix	…
archive	resolve conflicts	2001-07-22 22:53:00 +00:00
asterix	…
att3b	…
audio	resolve conflicts	2001-07-22 22:53:00 +00:00
blender	…
blit	…
bsdi	…
c-lang	…
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	resolve conflicts	2001-09-09 10:46:36 +00:00
compress	…
console	…
convex	…
ctags	…
database	resolve conflicts	2001-07-22 22:53:00 +00:00
diamond	…
diff	…
digital	…
dump	…
dyadic	file 3.34	2001-03-17 11:06:52 +00:00
editors	file 3.34	2001-03-17 11:06:52 +00:00
elf	resolve conflicts	2001-07-22 22:53:00 +00:00
encore	…
epoc	…
filesystems	resolve conflicts	2001-09-09 10:46:36 +00:00
flash	…
fonts	…
frame	…
freebsd	resolve conflicts	2001-07-22 22:53:00 +00:00
fsav	…
gimp	…
gnu	…
grace	…
hitachi-sh	invert the meanings of the F_LSYMS field.	2001-08-14 21:26:54 +00:00
hp	resolve conflicts	2001-03-17 11:21:51 +00:00
ibm370	…
ibm6000	…
iff	…
images	resolve conflicts	2001-09-09 10:46:36 +00:00
intel	…
interleaf	…
island	…
ispell	…
java	…
jpeg	resolve conflicts	2001-07-22 22:53:00 +00:00
karma	…
lecter	…
lex	…
lif	…
linux	…
lisp	resolve conflicts	2001-03-17 11:21:51 +00:00
mach	…
macintosh	file 3.36	2001-07-22 22:31:55 +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	…
mime	…
mips	mips-magic is back	2001-07-22 23:29:55 +00:00
mirage	…
mkid	…
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	alpha core has signal number in little endian, no in big endian.	2001-05-16 00:52:48 +00:00
netscape	…
news	…
octave	…
olf	…
os2	…
os9	resolve conflicts	2001-03-17 11:21:51 +00:00
osf1	…
palm	…
parix	file 3.34	2001-03-17 11:06:52 +00:00
pbm	…
pdf	…
pdp	…
pgp	…
pkgadd	…
plus5	…
printer	…
project	…
psdbms	…
pyramid	…
python	…
riff	file 3.36	2001-07-22 22:31:55 +00:00
rpm	…
rtf	…
sc	…
sccs	…
sendmail	…
sequent	…
sgml	…
sharc	file 3.36	2001-07-22 22:31:55 +00:00
sketch	file 3.36	2001-07-22 22:31:55 +00:00
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	file 3.36	2001-07-22 22:31:55 +00:00
teapot	…
terminfo	…
tex	…
ti-8x	…
timezone	…
troff	make file(1) recognize our manpages in src/gnu/libexec/uucp/*	2001-06-24 01:40:30 +00:00
tuxedo	file 3.34	2001-03-17 11:06:52 +00:00
typeset	…
unknown	…
uuencode	…
varied.out	…
vax	…
vicar	…
visx	…
vms	…
vmware	…
vorbis	file 3.36	2001-07-22 22:31:55 +00:00
wordperfect	…
xdelta	…
xenix	…
zilog	…
zyxel	…