From owner-cvs-all@FreeBSD.ORG  Wed Jan 24 07:53:32 2007
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 [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 147C916A401;
	Wed, 24 Jan 2007 07:53:32 +0000 (UTC)
	(envelope-from oliver@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E111D13C4C4;
	Wed, 24 Jan 2007 07:53:31 +0000 (UTC)
	(envelope-from oliver@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0O7rVXN002855;
	Wed, 24 Jan 2007 07:53:31 GMT
	(envelope-from oliver@repoman.freebsd.org)
Received: (from oliver@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0O7rVmw002854;
	Wed, 24 Jan 2007 07:53:31 GMT (envelope-from oliver)
Message-Id: <200701240753.l0O7rVmw002854@repoman.freebsd.org>
From: Oliver Lehmann <oliver@FreeBSD.org>
Date: Wed, 24 Jan 2007 07:53:31 +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-wm/xfce4-panel 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, 24 Jan 2007 07:53:32 -0000

oliver      2007-01-24 07:53:31 UTC

  FreeBSD ports repository

  Modified files:
    x11-wm/xfce4-panel   Makefile 
  Log:
  xfce4-panel 4.4 is conflicting with old 4.2 xfce4-systray since it xfce4-systray
  is included in xfce4-panel 4.4
  CONFLICTS added
  
  Noted by:       thompsa
  
  Revision  Changes    Path
  1.36      +1 -0      ports/x11-wm/xfce4-panel/Makefile