From owner-cvs-src@FreeBSD.ORG  Sun Aug 20 15:50:51 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ECDD316A4DF;
	Sun, 20 Aug 2006 15:50:51 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 827CC43D68;
	Sun, 20 Aug 2006 15:50:51 +0000 (GMT)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7KFopjB037082;
	Sun, 20 Aug 2006 15:50:51 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7KFop2T037081;
	Sun, 20 Aug 2006 15:50:51 GMT (envelope-from delphij)
Message-Id: <200608201550.k7KFop2T037081@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 20 Aug 2006 15:50:51 +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-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: Sun, 20 Aug 2006 15:50:52 -0000

delphij     2006-08-20 15:50:51 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.6       +31 -20    src/contrib/less/command.c
  1.5       +3 -10     src/contrib/less/forwback.c
  1.6       +72 -23    src/contrib/less/less.h
  1.3       +576 -295  src/contrib/less/line.c
  1.5       +8 -6      src/contrib/less/main.c
  1.5       +21 -9     src/contrib/less/prompt.c
  1.5       +103 -126  src/contrib/less/screen.c
  1.6       +90 -40    src/contrib/less/search.c
  1.4       +4 -1      src/contrib/less/signal.c