From owner-cvs-all@FreeBSD.ORG  Tue Jul  7 20:06:31 2009
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 9603E1065673;
	Tue,  7 Jul 2009 20:06:31 +0000 (UTC) (envelope-from mva@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BAB38FC1B;
	Tue,  7 Jul 2009 20:06:31 +0000 (UTC) (envelope-from mva@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n67K6VoP002451;
	Tue, 7 Jul 2009 20:06:31 GMT (envelope-from mva@repoman.freebsd.org)
Received: (from mva@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n67K6VPw002450;
	Tue, 7 Jul 2009 20:06:31 GMT (envelope-from mva)
Message-Id: <200907072006.n67K6VPw002450@repoman.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Tue, 7 Jul 2009 20:06:31 +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/audio/timidity 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, 07 Jul 2009 20:06:32 -0000

mva         2009-07-07 20:06:31 UTC

  FreeBSD ports repository

  Modified files:
    audio/timidity       Makefile 
  Log:
  Fixed CONFLICTS for timidity++ 2.13
  
  Approved by:    miwi (mentor)
  
  Revision  Changes    Path
  1.30      +1 -1      ports/audio/timidity/Makefile