From owner-cvs-all@FreeBSD.ORG  Sat Aug  1 23:44:59 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 9A0EA106564A;
	Sat,  1 Aug 2009 23:44:59 +0000 (UTC)
	(envelope-from timur@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EA7A8FC0C;
	Sat,  1 Aug 2009 23:44:59 +0000 (UTC)
	(envelope-from timur@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n71NixVN087644;
	Sat, 1 Aug 2009 23:44:59 GMT
	(envelope-from timur@repoman.freebsd.org)
Received: (from timur@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n71NixvL087643;
	Sat, 1 Aug 2009 23:44:59 GMT (envelope-from timur)
Message-Id: <200908012344.n71NixvL087643@repoman.freebsd.org>
From: "Timur I. Bakeyev" <timur@FreeBSD.org>
Date: Sat, 1 Aug 2009 23:44:59 +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/net/samba3 Makefile ports/net/samba32 Makefile
 ports/net/samba33 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: Sat, 01 Aug 2009 23:45:00 -0000

timur       2009-08-01 23:44:59 UTC

  FreeBSD ports repository

  Modified files:
    net/samba3           Makefile 
    net/samba32          Makefile 
    net/samba33          Makefile 
  Log:
  Fix CONFLICTS
  
  Revision  Changes    Path
  1.186     +1 -1      ports/net/samba3/Makefile
  1.11      +1 -1      ports/net/samba32/Makefile
  1.6       +1 -1      ports/net/samba33/Makefile