Received: by mail.netbsd.org (Postfix, from userid 605) id CC81884F18; Wed, 23 Feb 2022 15:24:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0BE1D84F17 for ; Wed, 23 Feb 2022 15:24:07 +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 7EcC9XsMyd3r for ; Wed, 23 Feb 2022 15:24:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 90F0A84D10 for ; Wed, 23 Feb 2022 15:24:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 88A2DFB24; Wed, 23 Feb 2022 15:24:06 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Wed, 23 Feb 2022 10:24:06 -0500 From: "Christos Zoulas" Subject: CVS commit: src/external/mit/expat/dist To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20220223152406.88A2DFB24@cvs.NetBSD.org> Sender: source-changes-owner@NetBSD.org List-Id: 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: Wed Feb 23 15:24:06 UTC 2022 Modified Files: src/external/mit/expat/dist/conftools: config.guess config.sub src/external/mit/expat/dist/lib: xmlparse.c xmltok.c xmltok.h xmltok_impl.c src/external/mit/expat/dist/tests: xmltest.sh Removed Files: src/external/mit/expat/dist/conftools: PrintPath src/external/mit/expat/dist/doc: expat.png valid-xhtml10.png Log Message: merge conflicts between expat-2.2.8 and expat-2.4.6 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/conftools/PrintPath cvs rdiff -u -r1.5 -r1.6 src/external/mit/expat/dist/conftools/config.guess cvs rdiff -u -r1.4 -r1.5 src/external/mit/expat/dist/conftools/config.sub cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/doc/expat.png \ src/external/mit/expat/dist/doc/valid-xhtml10.png cvs rdiff -u -r1.8 -r1.9 src/external/mit/expat/dist/lib/xmlparse.c cvs rdiff -u -r1.5 -r1.6 src/external/mit/expat/dist/lib/xmltok.c cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/dist/lib/xmltok.h cvs rdiff -u -r1.6 -r1.7 src/external/mit/expat/dist/lib/xmltok_impl.c cvs rdiff -u -r1.4 -r1.5 src/external/mit/expat/dist/tests/xmltest.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.