From owner-cvs-all@FreeBSD.ORG  Mon Jun  4 01:43:12 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1403016A46B;
	Mon,  4 Jun 2007 01:43:12 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 03D9813C4BE;
	Mon,  4 Jun 2007 01:43:12 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l541hBAt018529;
	Mon, 4 Jun 2007 01:43:11 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l541hBuh018527;
	Mon, 4 Jun 2007 01:43:11 GMT (envelope-from delphij)
Message-Id: <200706040143.l541hBuh018527@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 4 Jun 2007 01:43:11 +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/contrib/less command.c forwback.c less.h line.c
 main.c prompt.c screen.c search.c signal.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: 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: Mon, 04 Jun 2007 01:43:12 -0000

delphij     2007-06-04 01:43:11 UTC

  FreeBSD src repository

  Modified files:
    contrib/less         command.c forwback.c less.h line.c main.c 
                         prompt.c screen.c search.c signal.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.7       +38 -13    src/contrib/less/command.c
  1.6       +23 -14    src/contrib/less/forwback.c
  1.7       +6 -1      src/contrib/less/less.h
  1.4       +26 -4     src/contrib/less/line.c
  1.6       +23 -16    src/contrib/less/main.c
  1.6       +8 -3      src/contrib/less/prompt.c
  1.6       +49 -6     src/contrib/less/screen.c
  1.7       +102 -36   src/contrib/less/search.c
  1.5       +6 -7      src/contrib/less/signal.c