CVS commit: basesrc/usr.bin/file

[Antti Kantee <pooka%netbsd.org@localhost>]

Module Name:    basesrc
Committed By:   pooka
Date:           Tue Jul  9 14:59:57 UTC 2002

Modified Files:
        basesrc/usr.bin/file: apprentice.c ascmagic.c compress.c config.h
            file.1 file.c file.h fsmagic.c is_tar.c magic.5 patchlevel.h
            print.c readelf.c readelf.h softmagic.c
        basesrc/usr.bin/file/magdir: archive audio database filesystems linux

Log Message:
end this destructive conflict


To generate a diff of this commit:
cvs rdiff -r1.31 -r1.32 basesrc/usr.bin/file/apprentice.c
cvs rdiff -r1.18 -r1.19 basesrc/usr.bin/file/ascmagic.c
cvs rdiff -r1.12 -r1.13 basesrc/usr.bin/file/compress.c
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/config.h \
    basesrc/usr.bin/file/readelf.h
cvs rdiff -r1.26 -r1.27 basesrc/usr.bin/file/file.1
cvs rdiff -r1.27 -r1.28 basesrc/usr.bin/file/file.c \
    basesrc/usr.bin/file/file.h
cvs rdiff -r1.16 -r1.17 basesrc/usr.bin/file/fsmagic.c
cvs rdiff -r1.14 -r1.15 basesrc/usr.bin/file/is_tar.c
cvs rdiff -r1.21 -r1.22 basesrc/usr.bin/file/magic.5
cvs rdiff -r1.17 -r1.18 basesrc/usr.bin/file/patchlevel.h
cvs rdiff -r1.25 -r1.26 basesrc/usr.bin/file/print.c
cvs rdiff -r1.15 -r1.16 basesrc/usr.bin/file/readelf.c
cvs rdiff -r1.28 -r1.29 basesrc/usr.bin/file/softmagic.c
cvs rdiff -r1.11 -r1.12 basesrc/usr.bin/file/magdir/archive \
    basesrc/usr.bin/file/magdir/filesystems
cvs rdiff -r1.13 -r1.14 basesrc/usr.bin/file/magdir/audio
cvs rdiff -r1.8 -r1.9 basesrc/usr.bin/file/magdir/database
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/file/magdir/linux

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.