From owner-cvs-all@FreeBSD.ORG  Wed Jan 27 17:08:52 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 64F84106566B;
	Wed, 27 Jan 2010 17:08:52 +0000 (UTC)
	(envelope-from nobutaka@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B6808FC1F;
	Wed, 27 Jan 2010 17:08:52 +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 o0RH8qDg089398;
	Wed, 27 Jan 2010 17:08:52 GMT
	(envelope-from nobutaka@repoman.freebsd.org)
Received: (from nobutaka@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0RH8qUo089397;
	Wed, 27 Jan 2010 17:08:52 GMT (envelope-from nobutaka)
Message-Id: <201001271708.o0RH8qUo089397@repoman.freebsd.org>
From: MANTANI Nobutaka <nobutaka@FreeBSD.org>
Date: Wed, 27 Jan 2010 17:08:52 +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/textproc/uim-el Makefile
 ports/textproc/uim-el-emacs21
 Makefile ports/textproc/uim-el-xemacs21-mule 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: Wed, 27 Jan 2010 17:08:52 -0000

nobutaka    2010-01-27 17:08:52 UTC

  FreeBSD ports repository

  Modified files:
    textproc/uim-el      Makefile 
    textproc/uim-el-emacs21 Makefile 
    textproc/uim-el-xemacs21-mule Makefile 
  Log:
  Update CONFLICTS.
  
  Revision  Changes    Path
  1.2       +2 -1      ports/textproc/uim-el-emacs21/Makefile
  1.3       +3 -2      ports/textproc/uim-el-xemacs21-mule/Makefile
  1.28      +2 -1      ports/textproc/uim-el/Makefile