From owner-cvs-all@FreeBSD.ORG  Tue Apr 19 01:48:59 2011
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1FF92106566B;
	Tue, 19 Apr 2011 01:48:58 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B045A8FC0C;
	Tue, 19 Apr 2011 01:48:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p3J1mwwm097120;
	Tue, 19 Apr 2011 01:48:58 GMT (envelope-from cy@repoman.freebsd.org)
Received: (from cy@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p3J1mwRn097119;
	Tue, 19 Apr 2011 01:48:58 GMT (envelope-from cy)
Message-Id: <201104190148.p3J1mwRn097119@repoman.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 19 Apr 2011 01:48:58 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/x11-wm/fvwm2-devel Makefile ports/x11-wm/fvwm2
 Makefile ports/x11-wm/fvwm24 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Apr 2011 01:48:59 -0000

cy          2011-04-19 01:48:58 UTC

  FreeBSD ports repository

  Modified files:
    x11-wm/fvwm2-devel   Makefile 
    x11-wm/fvwm2         Makefile 
    x11-wm/fvwm24        Makefile 
  Log:
  Fix up CONFLICTS.
  
  Revision  Changes    Path
  1.124     +1 -1      ports/x11-wm/fvwm2-devel/Makefile
  1.83      +1 -1      ports/x11-wm/fvwm2/Makefile
  1.83      +1 -1      ports/x11-wm/fvwm24/Makefile