From owner-cvs-all@FreeBSD.ORG  Sat May 14 19:02:37 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A245316A4CE; Sat, 14 May 2005 19:02:37 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7B63743D78; Sat, 14 May 2005 19:02:37 +0000 (GMT)
	(envelope-from ahze@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4EJ2bJi020531;
	Sat, 14 May 2005 19:02:37 GMT
	(envelope-from ahze@repoman.freebsd.org)
Received: (from ahze@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4EJ2bTR020530;
	Sat, 14 May 2005 19:02:37 GMT
	(envelope-from ahze)
Message-Id: <200505141902.j4EJ2bTR020530@repoman.freebsd.org>
From: Michael Johnson <ahze@FreeBSD.org>
Date: Sat, 14 May 2005 19:02:37 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/multimedia/vlc Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: 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: Sat, 14 May 2005 19:02:37 -0000

ahze        2005-05-14 19:02:37 UTC

  FreeBSD ports repository

  Modified files:
    multimedia/vlc       Makefile 
  Log:
  - Add CONFLICTS to vlc-devel
  
  Revision  Changes    Path
  1.92      +2 -0      ports/multimedia/vlc/Makefile