Module Name:	basesrc
Committed By:	pooka
Date:		Sun Jul 22 22:32:21 UTC 2001

Update of /cvsroot/basesrc/usr.bin/file
In directory netbsd.hut.fi:/tmp/cvs-serv28733

Log Message:
file 3.36


Vendor Tag:	CHRISTOS
Release Tags:	FILE3_36
		
U basesrc/usr.bin/file/LEGAL.NOTICE
U basesrc/usr.bin/file/MAINT
C basesrc/usr.bin/file/magic.mime
U basesrc/usr.bin/file/README
C basesrc/usr.bin/file/apprentice.c
U basesrc/usr.bin/file/ascmagic.c
C basesrc/usr.bin/file/compress.c
C basesrc/usr.bin/file/file.c
C basesrc/usr.bin/file/file.h
U basesrc/usr.bin/file/fsmagic.c
U basesrc/usr.bin/file/is_tar.c
U basesrc/usr.bin/file/names.h
C basesrc/usr.bin/file/patchlevel.h
C basesrc/usr.bin/file/print.c
U basesrc/usr.bin/file/readelf.c
U basesrc/usr.bin/file/readelf.h
C basesrc/usr.bin/file/softmagic.c
U basesrc/usr.bin/file/tar.h
C basesrc/usr.bin/file/file.1
C basesrc/usr.bin/file/magic.5
U basesrc/usr.bin/file/Header
U basesrc/usr.bin/file/Localstuff
U basesrc/usr.bin/file/Makefile
C basesrc/usr.bin/file/config.h
N basesrc/usr.bin/file/magdir/adi
U basesrc/usr.bin/file/magdir/zilog
U basesrc/usr.bin/file/magdir/xenix
U basesrc/usr.bin/file/magdir/xdelta
U basesrc/usr.bin/file/magdir/wordperfect
N basesrc/usr.bin/file/magdir/vorbis
U basesrc/usr.bin/file/magdir/vmware
U basesrc/usr.bin/file/magdir/vms
U basesrc/usr.bin/file/magdir/visx
U basesrc/usr.bin/file/magdir/vicar
U basesrc/usr.bin/file/magdir/vax
U basesrc/usr.bin/file/magdir/varied.out
U basesrc/usr.bin/file/magdir/uuencode
U basesrc/usr.bin/file/magdir/unknown
U basesrc/usr.bin/file/magdir/typeset
U basesrc/usr.bin/file/magdir/tuxedo
C basesrc/usr.bin/file/magdir/troff
U basesrc/usr.bin/file/magdir/timezone
U basesrc/usr.bin/file/magdir/ti-8x
U basesrc/usr.bin/file/magdir/tex
U basesrc/usr.bin/file/magdir/terminfo
U basesrc/usr.bin/file/magdir/teapot
N basesrc/usr.bin/file/magdir/sysex
U basesrc/usr.bin/file/magdir/sun
U basesrc/usr.bin/file/magdir/spectrum
C basesrc/usr.bin/file/magdir/softquad
C basesrc/usr.bin/file/magdir/sniffer
N basesrc/usr.bin/file/magdir/smalltalk
N basesrc/usr.bin/file/magdir/sketch
U basesrc/usr.bin/file/magdir/sc
N basesrc/usr.bin/file/magdir/sharc
U basesrc/usr.bin/file/magdir/sgml
U basesrc/usr.bin/file/magdir/sequent
U basesrc/usr.bin/file/magdir/sendmail
U basesrc/usr.bin/file/magdir/sccs
U basesrc/usr.bin/file/magdir/rtf
U basesrc/usr.bin/file/magdir/rpm
U basesrc/usr.bin/file/magdir/riff
U basesrc/usr.bin/file/magdir/python
U basesrc/usr.bin/file/magdir/pyramid
U basesrc/usr.bin/file/magdir/psdbms
U basesrc/usr.bin/file/magdir/project
U basesrc/usr.bin/file/magdir/printer
U basesrc/usr.bin/file/magdir/plus5
U basesrc/usr.bin/file/magdir/pkgadd
U basesrc/usr.bin/file/magdir/pgp
U basesrc/usr.bin/file/magdir/pdp
U basesrc/usr.bin/file/magdir/pdf
U basesrc/usr.bin/file/magdir/pbm
U basesrc/usr.bin/file/magdir/parix
U basesrc/usr.bin/file/magdir/palm
U basesrc/usr.bin/file/magdir/osf1
U basesrc/usr.bin/file/magdir/os9
U basesrc/usr.bin/file/magdir/os2
U basesrc/usr.bin/file/magdir/olf
U basesrc/usr.bin/file/magdir/octave
U basesrc/usr.bin/file/magdir/news
U basesrc/usr.bin/file/magdir/netscape
C basesrc/usr.bin/file/magdir/netbsd
U basesrc/usr.bin/file/magdir/ncr
U basesrc/usr.bin/file/magdir/msvc
C basesrc/usr.bin/file/magdir/msdos
C basesrc/usr.bin/file/magdir/motorola
U basesrc/usr.bin/file/magdir/lif
U basesrc/usr.bin/file/magdir/modem
U basesrc/usr.bin/file/magdir/mmdf
U basesrc/usr.bin/file/magdir/mkid
U basesrc/usr.bin/file/magdir/mirage
C basesrc/usr.bin/file/magdir/mips
U basesrc/usr.bin/file/magdir/mime
U basesrc/usr.bin/file/magdir/mcrypt
U basesrc/usr.bin/file/magdir/mathematica
U basesrc/usr.bin/file/magdir/maple
C basesrc/usr.bin/file/magdir/mail.news
C basesrc/usr.bin/file/magdir/magic
U basesrc/usr.bin/file/magdir/macintosh
U basesrc/usr.bin/file/magdir/mach
U basesrc/usr.bin/file/magdir/lisp
U basesrc/usr.bin/file/magdir/linux
U basesrc/usr.bin/file/magdir/lex
U basesrc/usr.bin/file/magdir/lecter
U basesrc/usr.bin/file/magdir/karma
C basesrc/usr.bin/file/magdir/jpeg
U basesrc/usr.bin/file/magdir/java
U basesrc/usr.bin/file/magdir/ispell
U basesrc/usr.bin/file/magdir/island
U basesrc/usr.bin/file/magdir/interleaf
U basesrc/usr.bin/file/magdir/intel
C basesrc/usr.bin/file/magdir/images
U basesrc/usr.bin/file/magdir/iff
U basesrc/usr.bin/file/magdir/ibm6000
U basesrc/usr.bin/file/magdir/ibm370
U basesrc/usr.bin/file/magdir/hp
U basesrc/usr.bin/file/magdir/hitachi-sh
U basesrc/usr.bin/file/magdir/gnu
U basesrc/usr.bin/file/magdir/grace
U basesrc/usr.bin/file/magdir/gimp
U basesrc/usr.bin/file/magdir/fsav
C basesrc/usr.bin/file/magdir/freebsd
U basesrc/usr.bin/file/magdir/frame
U basesrc/usr.bin/file/magdir/fonts
U basesrc/usr.bin/file/magdir/flash
C basesrc/usr.bin/file/magdir/filesystems
U basesrc/usr.bin/file/magdir/epoc
U basesrc/usr.bin/file/magdir/encore
C basesrc/usr.bin/file/magdir/elf
U basesrc/usr.bin/file/magdir/editors
U basesrc/usr.bin/file/magdir/dyadic
U basesrc/usr.bin/file/magdir/dump
U basesrc/usr.bin/file/magdir/digital
U basesrc/usr.bin/file/magdir/diff
U basesrc/usr.bin/file/magdir/diamond
C basesrc/usr.bin/file/magdir/database
U basesrc/usr.bin/file/magdir/ctags
U basesrc/usr.bin/file/magdir/convex
U basesrc/usr.bin/file/magdir/console
U basesrc/usr.bin/file/magdir/compress
U basesrc/usr.bin/file/magdir/commands
U basesrc/usr.bin/file/magdir/clipper
U basesrc/usr.bin/file/magdir/claris
U basesrc/usr.bin/file/magdir/cisco
U basesrc/usr.bin/file/magdir/chi
U basesrc/usr.bin/file/magdir/c-lang
U basesrc/usr.bin/file/magdir/bsdi
U basesrc/usr.bin/file/magdir/blit
U basesrc/usr.bin/file/magdir/blender
U basesrc/usr.bin/file/magdir/apl
C basesrc/usr.bin/file/magdir/audio
U basesrc/usr.bin/file/magdir/att3b
U basesrc/usr.bin/file/magdir/asterix
C basesrc/usr.bin/file/magdir/archive
U basesrc/usr.bin/file/magdir/applix
C basesrc/usr.bin/file/magdir/apple
C basesrc/usr.bin/file/magdir/animation
U basesrc/usr.bin/file/magdir/amigaos
U basesrc/usr.bin/file/magdir/amanda
U basesrc/usr.bin/file/magdir/alpha
U basesrc/usr.bin/file/magdir/alliant
U basesrc/usr.bin/file/magdir/allegro
U basesrc/usr.bin/file/magdir/adventure
U basesrc/usr.bin/file/magdir/zyxel

30 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCHRISTOS:yesterday -jCHRISTOS basesrc/usr.bin/file