From owner-cvs-all@FreeBSD.ORG  Sat Oct  9 18:02:25 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 42CC3106566C;
	Sat,  9 Oct 2010 18:02:25 +0000 (UTC)
	(envelope-from makc@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1936F8FC15;
	Sat,  9 Oct 2010 18:02:25 +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 o99I2O4A099843;
	Sat, 9 Oct 2010 18:02:24 GMT (envelope-from makc@repoman.freebsd.org)
Received: (from makc@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o99I2OYv099842;
	Sat, 9 Oct 2010 18:02:24 GMT (envelope-from makc)
Message-Id: <201010091802.o99I2OYv099842@repoman.freebsd.org>
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Sat, 9 Oct 2010 18:02:24 +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/print/lyx14 Makefile ports/print/lyx 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, 09 Oct 2010 18:02:25 -0000

makc        2010-10-09 18:02:24 UTC

  FreeBSD ports repository

  Modified files:
    print/lyx14          Makefile 
    print/lyx            Makefile 
  Log:
  Mark conflict with lyx-devel
  
  Revision  Changes    Path
  1.127     +2 -1      ports/print/lyx/Makefile
  1.126     +2 -2      ports/print/lyx14/Makefile