From owner-cvs-all@FreeBSD.ORG  Thu Jun 21 10:44:52 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 18C6216A41F;
	Thu, 21 Jun 2007 10:44:52 +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 E71B313C465;
	Thu, 21 Jun 2007 10:44:51 +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 l5LAipok033220;
	Thu, 21 Jun 2007 10:44:51 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LAip7X033216;
	Thu, 21 Jun 2007 10:44:51 GMT (envelope-from delphij)
Message-Id: <200706211044.l5LAip7X033216@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 21 Jun 2007 10:44: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 screen.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: Thu, 21 Jun 2007 10:44:52 -0000

delphij     2007-06-21 10:44:50 UTC

  FreeBSD src repository

  Modified files:
    contrib/less         command.c forwback.c screen.c 
  Log:
  Resolve conflicts after less(1) v406 import.
  
  Approved by:    re (hrs)
  
  Revision  Changes    Path
  1.8       +1 -1      src/contrib/less/command.c
  1.7       +0 -3      src/contrib/less/forwback.c
  1.7       +18 -0     src/contrib/less/screen.c