From owner-cvs-all@FreeBSD.ORG  Thu Mar 25 22:38:34 2010
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 5F29F106564A;
	Thu, 25 Mar 2010 22:38:34 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 350098FC13;
	Thu, 25 Mar 2010 22:38:34 +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 o2PMcYv0099866;
	Thu, 25 Mar 2010 22:38:34 GMT (envelope-from mm@repoman.freebsd.org)
Received: (from mm@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2PMcYN2099865;
	Thu, 25 Mar 2010 22:38:34 GMT (envelope-from mm)
Message-Id: <201003252238.o2PMcYN2099865@repoman.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Thu, 25 Mar 2010 22:38:34 +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/devel/icu Makefile ports/devel/icu4 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: Thu, 25 Mar 2010 22:38:34 -0000

mm          2010-03-25 22:38:34 UTC

  FreeBSD ports repository

  Modified files:
    devel/icu            Makefile 
    devel/icu4           Makefile 
  Log:
  - Fix CONFLICTS between icu3 and icu4
  
  PR:             ports/142910
  Approved by:    maintainer (timeout)
  
  Revision  Changes    Path
  1.35      +2 -2      ports/devel/icu/Makefile
  1.39      +1 -1      ports/devel/icu4/Makefile