From owner-cvs-all@FreeBSD.ORG  Fri Oct 23 13:04:42 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 410B6106566B;
	Fri, 23 Oct 2009 13:04:42 +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 172238FC08;
	Fri, 23 Oct 2009 13:04:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9ND4fv8008943;
	Fri, 23 Oct 2009 13:04:41 GMT
	(envelope-from ehaupt@repoman.freebsd.org)
Received: (from ehaupt@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9ND4fGh008942;
	Fri, 23 Oct 2009 13:04:41 GMT (envelope-from ehaupt)
Message-Id: <200910231304.n9ND4fGh008942@repoman.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Fri, 23 Oct 2009 13:04:41 +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/sysutils/synergy Makefile
 ports/sysutils/synergy-plus 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: Fri, 23 Oct 2009 13:04:42 -0000

ehaupt      2009-10-23 13:04:41 UTC

  FreeBSD ports repository

  Modified files:
    sysutils/synergy     Makefile 
    sysutils/synergy-plus Makefile 
  Log:
  Register CONFLICTS
  
  Revision  Changes    Path
  1.2       +3 -0      ports/sysutils/synergy-plus/Makefile
  1.22      +3 -1      ports/sysutils/synergy/Makefile