From owner-cvs-usrbin  Tue Mar 18 11:37:46 1997
Return-Path: <owner-cvs-usrbin>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id LAA21783
          for cvs-usrbin-outgoing; Tue, 18 Mar 1997 11:37:46 -0800 (PST)
Received: (from mpp@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id LAA21770;
          Tue, 18 Mar 1997 11:37:44 -0800 (PST)
Date: Tue, 18 Mar 1997 11:37:44 -0800 (PST)
From: Mike Pritchard <mpp>
Message-Id: <199703181937.LAA21770@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-usrbin
Subject: cvs commit:  src/usr.bin/file Makefile README apprentice.c ascmagic.c file.1 file.c file.h fsmagic.c is_tar.c magic.5 names.h patchlevel.h print.c softmagic.c src/usr.bin/file/Magdir audio elf freebsd java pgp
Sender: owner-cvs-usrbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

mpp         97/03/18 11:37:43

  Modified:    usr.bin/file  Makefile README apprentice.c ascmagic.c file.1
                        file.c file.h  fsmagic.c is_tar.c magic.5 names.h
                        patchlevel.h print.c  softmagic.c
               usr.bin/file/Magdir  audio elf freebsd java pgp
  Log:
  Merge to resolve conflicts with file 3.22 merge.
  
  Revision  Changes    Path
  1.10      +3 -3      src/usr.bin/file/Makefile
  1.4       +22 -10    src/usr.bin/file/README
  1.6       +12 -13    src/usr.bin/file/apprentice.c
  1.7       +3 -2      src/usr.bin/file/ascmagic.c
  1.9       +53 -36    src/usr.bin/file/file.1
  1.7       +109 -64   src/usr.bin/file/file.c
  1.7       +27 -8     src/usr.bin/file/file.h
  1.6       +11 -6     src/usr.bin/file/fsmagic.c
  1.5       +6 -6      src/usr.bin/file/is_tar.c
  1.7       +18 -6     src/usr.bin/file/magic.5
  1.5       +17 -9     src/usr.bin/file/names.h
  1.7       +34 -4     src/usr.bin/file/patchlevel.h
  1.6       +4 -4      src/usr.bin/file/print.c
  1.7       +79 -41    src/usr.bin/file/softmagic.c
  1.3       +23 -6     src/usr.bin/file/Magdir/audio
  1.3       +25 -6     src/usr.bin/file/Magdir/elf
  1.7       +80 -47    src/usr.bin/file/Magdir/freebsd
  1.2       +6 -1      src/usr.bin/file/Magdir/java
  1.4       +1 -0      src/usr.bin/file/Magdir/pgp