Received: by mail.netbsd.org (Postfix, from userid 605) id 0067885E8C; Sun, 3 Jul 2016 10:23:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 82DDE85E80 for ; Sun, 3 Jul 2016 10:23:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id iSmkAYqzPW7r for ; Sun, 3 Jul 2016 10:23:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2FA7F84CED for ; Sun, 3 Jul 2016 10:23:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2A23EFBB5; Sun, 3 Jul 2016 10:23:34 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Sun, 3 Jul 2016 10:23:34 +0000 From: "Abhinav Upadhyay" Subject: CVS commit: src/external/public-domain/sqlite/dist To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20160703102334.2A23EFBB5@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: "Abhinav Upadhyay" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: abhinav Date: Sun Jul 3 10:23:31 UTC 2016 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.c Log Message: Merge conflicts for sqlite-3.13.0 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/public-domain/sqlite/dist/sqlite3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.