From owner-cvs-all@FreeBSD.ORG Fri Oct 28 10:07:30 2005 Return-Path: X-Original-To: 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 7C90116A41F; Fri, 28 Oct 2005 10:07:30 +0000 (GMT) (envelope-from ahze@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A7E843D46; Fri, 28 Oct 2005 10:07:30 +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 j9SA7U7T094599; Fri, 28 Oct 2005 10:07:30 GMT (envelope-from ahze@repoman.freebsd.org) Received: (from ahze@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9SA7U5A094598; Fri, 28 Oct 2005 10:07:30 GMT (envelope-from ahze) Message-Id: <200510281007.j9SA7U5A094598@repoman.freebsd.org> From: Michael Johnson Date: Fri, 28 Oct 2005 10:07:30 +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/multimedia/vlc-devel Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2005 10:07:30 -0000 ahze 2005-10-28 10:07:30 UTC FreeBSD ports repository Modified files: multimedia/vlc-devel Makefile Log: - Fix CONFLICTS 0.8.4 -> 0.8.2 Revision Changes Path 1.123 +1 -1 ports/multimedia/vlc-devel/Makefile