From owner-cvs-all@FreeBSD.ORG  Wed Apr 29 18:49:14 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 27FB71065670;
	Wed, 29 Apr 2009 18:49:14 +0000 (UTC)
	(envelope-from itetcu@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F1B698FC16;
	Wed, 29 Apr 2009 18:49:13 +0000 (UTC)
	(envelope-from itetcu@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 n3TInDgj033948;
	Wed, 29 Apr 2009 18:49:13 GMT
	(envelope-from itetcu@repoman.freebsd.org)
Received: (from itetcu@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3TInDWI033947;
	Wed, 29 Apr 2009 18:49:13 GMT (envelope-from itetcu)
Message-Id: <200904291849.n3TInDWI033947@repoman.freebsd.org>
From: Ion-Mihai Tetcu <itetcu@FreeBSD.org>
Date: Wed, 29 Apr 2009 18:49:13 +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/net/quagga 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: Wed, 29 Apr 2009 18:49:14 -0000

itetcu      2009-04-29 18:49:13 UTC

  FreeBSD ports repository

  Modified files:
    net/quagga           Makefile 
  Log:
  Fix INDEX by removing vs/rcs/??? merge conflicts.
  
  Reported by:    QAT
  
  Revision  Changes    Path
  1.82      +0 -7      ports/net/quagga/Makefile