From owner-cvs-ports@FreeBSD.ORG  Wed Jul 28 12:26:56 2010
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C1D7106567D;
	Wed, 28 Jul 2010 12:26:56 +0000 (UTC)
	(envelope-from ashish@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 12C418FC15;
	Wed, 28 Jul 2010 12:26:56 +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 o6SCQta6043447;
	Wed, 28 Jul 2010 12:26:55 GMT
	(envelope-from ashish@repoman.freebsd.org)
Received: (from ashish@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SCQt6R043446;
	Wed, 28 Jul 2010 12:26:55 GMT (envelope-from ashish)
Message-Id: <201007281226.o6SCQt6R043446@repoman.freebsd.org>
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Wed, 28 Jul 2010 12:26:55 +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/editors/emacs22 Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jul 2010 12:26:56 -0000

ashish      2010-07-28 12:26:55 UTC

  FreeBSD ports repository

  Modified files:
    editors/emacs22      Makefile 
  Log:
  - Add CONFLICTS to conflict with 23.x and 24.x.
  
  Approved by:    tabthorpe (mentor)
  
  Revision  Changes    Path
  1.93      +1 -1      ports/editors/emacs22/Makefile