From owner-cvs-src@FreeBSD.ORG  Fri Nov 16 22:24:31 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3C9D16A419;
	Fri, 16 Nov 2007 22:24:31 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9988C13C45D;
	Fri, 16 Nov 2007 22:24:31 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAGMOVFR077697;
	Fri, 16 Nov 2007 22:24:31 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAGMOVsA077696;
	Fri, 16 Nov 2007 22:24:31 GMT (envelope-from delphij)
Message-Id: <200711162224.lAGMOVsA077696@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 16 Nov 2007 22:24:31 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/usr.bin/less defines.h src/contrib/less command.c
 less.h line.c screen.c search.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Nov 2007 22:24:31 -0000

delphij     2007-11-16 22:24:31 UTC

  FreeBSD src repository

  Modified files:
    usr.bin/less         defines.h 
    contrib/less         command.c less.h line.c screen.c search.c 
  Log:
  Resolve conflicts; Update defines.h to reflect latest change.
  
  Revision  Changes    Path
  1.9       +32 -11    src/contrib/less/command.c
  1.9       +25 -5     src/contrib/less/less.h
  1.6       +17 -0     src/contrib/less/line.c
  1.9       +4 -0      src/contrib/less/screen.c
  1.10      +97 -66    src/contrib/less/search.c
  1.8       +9 -0      src/usr.bin/less/defines.h