From owner-cvs-src@FreeBSD.ORG  Mon Oct  8 16:17:42 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 B411E16A417;
	Mon,  8 Oct 2007 16:17:42 +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 8CBBA13C469;
	Mon,  8 Oct 2007 16:17:42 +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 l98GHgEo035979;
	Mon, 8 Oct 2007 16:17:42 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l98GHgha035978;
	Mon, 8 Oct 2007 16:17:42 GMT (envelope-from delphij)
Message-Id: <200710081617.l98GHgha035978@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 8 Oct 2007 16:17:42 +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/release/doc/en_US.ISO8859-1/relnotes article.sgml
 src/contrib/less less.h line.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: Mon, 08 Oct 2007 16:17:42 -0000

delphij     2007-10-08 16:17:42 UTC

  FreeBSD src repository

  Modified files:
    release/doc/en_US.ISO8859-1/relnotes article.sgml 
    contrib/less         less.h line.c search.c signal.c 
  Log:
  Resolve conflicts to complete less v408 import.
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.8       +3 -0      src/contrib/less/less.h
  1.5       +5 -5      src/contrib/less/line.c
  1.9       +27 -15    src/contrib/less/search.c
  1.6       +2 -0      src/contrib/less/signal.c
  1.1068    +1 -1      src/release/doc/en_US.ISO8859-1/relnotes/article.sgml