Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 9065863BC1D
	for <mhonarc+pkgsrc-changes@mail-index.netbsd.org>; Mon,  7 Sep 2009 16:39:29 +0000 (UTC)
Received: by mail.netbsd.org (Postfix, from userid 0)
	id 3C6D163B12F; Mon,  7 Sep 2009 16:39:29 +0000 (UTC)
Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd])
	by mail.netbsd.org (Postfix) with ESMTP id 746A163B121
	for <pkgsrc-changes@NetBSD.org>; Mon,  7 Sep 2009 16:39:28 +0000 (UTC)
Received: by cvs.netbsd.org (Postfix, from userid 500)
	id 640FE175D0; Mon,  7 Sep 2009 16:39:28 +0000 (UTC)
MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: binary
Content-Type: text/plain
Date: Mon, 7 Sep 2009 16:39:28 +0000
From: Matthias Drochner <drochner@netbsd.org>
Subject: CVS commit: pkgsrc/wm
To: pkgsrc-changes@NetBSD.org
Reply-To: drochner@netbsd.org
X-Mailer: log_accum
Message-Id: <20090907163928.640FE175D0@cvs.netbsd.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes
Precedence: list

Module Name:	pkgsrc
Committed By:	drochner
Date:		Mon Sep  7 16:39:28 UTC 2009

Modified Files:
	pkgsrc/wm/fvwm: Makefile
	pkgsrc/wm/metisse: Makefile

Log Message:
fvwm and metisse CONFLICT mutually


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/wm/fvwm/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/wm/metisse/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.