From owner-cvs-all@FreeBSD.ORG  Mon Jun 11 09:41:05 2012
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 C7E56106566C;
	Mon, 11 Jun 2012 09:41:05 +0000 (UTC)
	(envelope-from ehaupt@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A8598FC16;
	Mon, 11 Jun 2012 09:41:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q5B9f5kt058485;
	Mon, 11 Jun 2012 09:41:05 GMT
	(envelope-from ehaupt@repoman.freebsd.org)
Received: (from ehaupt@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q5B9f5Ad058484;
	Mon, 11 Jun 2012 09:41:05 GMT (envelope-from ehaupt)
Message-Id: <201206110941.q5B9f5Ad058484@repoman.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Mon, 11 Jun 2012 09:41:05 +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/deskutils/notify-osd Makefile
 ports/deskutils/xfce4-notification-daemon 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: Mon, 11 Jun 2012 09:41:05 -0000

ehaupt      2012-06-11 09:41:05 UTC

  FreeBSD ports repository

  Modified files:
    deskutils/notify-osd Makefile 
    deskutils/xfce4-notification-daemon Makefile 
  Log:
  Register CONFLICTS
  
  Submitted by:   "Sulev-Madis 'ketas' Silber" <madis555@hot.ee> (via mail)
  
  Revision  Changes    Path
  1.6       +3 -1      ports/deskutils/notify-osd/Makefile
  1.29      +2 -2      ports/deskutils/xfce4-notification-daemon/Makefile