From owner-cvs-all@FreeBSD.ORG  Fri Oct 10 23:13:36 2003
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 2C5A116A4B3; Fri, 10 Oct 2003 23:13:36 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9E36143FDF; Fri, 10 Oct 2003 23:13:35 -0700 (PDT)
	(envelope-from marcus@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9B6DZXJ068624;
	Fri, 10 Oct 2003 23:13:35 -0700 (PDT)
	(envelope-from marcus@repoman.freebsd.org)
Received: (from marcus@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9B6DZFv068623;
	Fri, 10 Oct 2003 23:13:35 -0700 (PDT)
	(envelope-from marcus)
Message-Id: <200310110613.h9B6DZFv068623@repoman.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Fri, 10 Oct 2003 23:13:35 -0700 (PDT)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/www/galeon Makefile ports/www/galeon2 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, 11 Oct 2003 06:13:36 -0000

marcus      2003/10/10 23:13:35 PDT

  FreeBSD ports repository

  Modified files:
    www/galeon           Makefile 
    www/galeon2          Makefile 
  Log:
  galeon and galeon2 conflict with each other.
  
  Submitted by:   Oliver Eikemeier <eikemeier@fillmore-labs.com>
  
  Revision  Changes    Path
  1.111     +2 -0      ports/www/galeon/Makefile
  1.118     +2 -0      ports/www/galeon2/Makefile