Received: by mail.netbsd.org (Postfix, from userid 605) id F06C484E07; Mon, 15 Jun 2020 00:37:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7538484E06 for ; Mon, 15 Jun 2020 00:37:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Z8uwdStEGRvC for ; Mon, 15 Jun 2020 00:37:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EB18684DA4 for ; Mon, 15 Jun 2020 00:37:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D9061FB28; Mon, 15 Jun 2020 00:37:25 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Sun, 14 Jun 2020 20:37:25 -0400 From: "Christos Zoulas" Subject: CVS commit: src/external/bsd/file To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20200615003725.D9061FB28@cvs.NetBSD.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Christos Zoulas" Mail-Followup-To: source-changes-d@NetBSD.org List-Unsubscribe: Module Name: src Committed By: christos Date: Mon Jun 15 00:37:25 UTC 2020 Modified Files: src/external/bsd/file/dist: ChangeLog Makefile.am Makefile.in configure configure.ac src/external/bsd/file/dist/doc: file.1 magic.5 src/external/bsd/file/dist/magic: Makefile.am Makefile.in src/external/bsd/file/dist/magic/magdir: archive elf filesystems parix pgp src/external/bsd/file/dist/src: apprentice.c compress.c der.c file.c file.h funcs.c is_csv.c is_json.c magic.c print.c readelf.c softmagic.c src/external/bsd/file/include: config.h src/external/bsd/file/lib: shlib_version Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/ChangeLog cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/Makefile.am cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/Makefile.in \ src/external/bsd/file/dist/configure.ac cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/configure cvs rdiff -u -r1.24 -r1.25 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/doc/magic.5 cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/magic/Makefile.am cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/magic/magdir/archive cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/magic/magdir/elf cvs rdiff -u -r1.16 -r1.17 \ src/external/bsd/file/dist/magic/magdir/filesystems cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/parix cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/magic/magdir/pgp cvs rdiff -u -r1.24 -r1.25 src/external/bsd/file/dist/src/apprentice.c \ src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/src/compress.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/der.c cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/src/file.c \ src/external/bsd/file/dist/src/magic.c \ src/external/bsd/file/dist/src/print.c cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/src/funcs.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/src/is_csv.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/src/is_json.c cvs rdiff -u -r1.23 -r1.24 src/external/bsd/file/dist/src/readelf.c cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/src/softmagic.c cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/include/config.h cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.