From owner-cvs-all@FreeBSD.ORG  Wed Sep 14 03:26:55 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 08B5C16A41F;
	Wed, 14 Sep 2005 03:26:55 +0000 (GMT)
	(envelope-from marcus@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BCA6043D45;
	Wed, 14 Sep 2005 03:26:54 +0000 (GMT)
	(envelope-from marcus@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 j8E3QsXL016081;
	Wed, 14 Sep 2005 03:26:54 GMT
	(envelope-from marcus@repoman.freebsd.org)
Received: (from marcus@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8E3QsKi016080;
	Wed, 14 Sep 2005 03:26:54 GMT (envelope-from marcus)
Message-Id: <200509140326.j8E3QsKi016080@repoman.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 14 Sep 2005 03:26:54 +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/x11/xscreensaver-gnome Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 14 Sep 2005 03:26:55 -0000

marcus      2005-09-14 03:26:54 UTC

  FreeBSD ports repository

  Modified files:
    x11/xscreensaver-gnome Makefile 
  Log:
  Conflict with xscreensaver-gnome-hacks.
  
  Revision  Changes    Path
  1.45      +1 -1      ports/x11/xscreensaver-gnome/Makefile