From owner-freebsd-commit  Tue Jan 23 04:40:48 1996
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id EAA11670
          for freebsd-commit-outgoing; Tue, 23 Jan 1996 04:40:48 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id EAA11658
          for cvs-all-outgoing; Tue, 23 Jan 1996 04:40:44 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id EAA11644
          for cvs-usrbin-outgoing; Tue, 23 Jan 1996 04:40:41 -0800 (PST)
Received: (from mpp@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id EAA11635
          Tue, 23 Jan 1996 04:40:39 -0800 (PST)
Date: Tue, 23 Jan 1996 04:40:39 -0800 (PST)
From: Mike Pritchard <mpp>
Message-Id: <199601231240.EAA11635@freefall.freebsd.org>
To: CVS-committers, cvs-usrbin
Subject: cvs commit: src/usr.bin/file/Magdir pgp zyxel
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

mpp         96/01/23 04:40:38

  Modified:    usr.bin/file  apprentice.c ascmagic.c compress.c file.1
                        file.c file.h  fsmagic.c magic.5 names.h
                        patchlevel.h print.c softmagic.c
               usr.bin/file/Magdir  pgp zyxel
  Log:
  Merged changes to resolve conflicts with file 3.19 import.
  
  Revision  Changes    Path
  1.3       +100 -29   src/usr.bin/file/apprentice.c
  1.3       +23 -20    src/usr.bin/file/ascmagic.c
  1.3       +7 -10     src/usr.bin/file/compress.c
  1.3       +26 -29    src/usr.bin/file/file.1
  1.3       +100 -27   src/usr.bin/file/file.c
  1.3       +6 -3      src/usr.bin/file/file.h
  1.3       +3 -1      src/usr.bin/file/fsmagic.c
  1.3       +8 -8      src/usr.bin/file/magic.5
  1.2       +7 -6      src/usr.bin/file/names.h
  1.3       +40 -2     src/usr.bin/file/patchlevel.h
  1.3       +5 -5      src/usr.bin/file/print.c
  1.4       +20 -8     src/usr.bin/file/softmagic.c
  1.3       +7 -6      src/usr.bin/file/Magdir/pgp
  1.3       +11 -6     src/usr.bin/file/Magdir/zyxel