From owner-cvs-all@FreeBSD.ORG  Mon Mar 27 23:11:33 2006
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 [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1029D16A400;
	Mon, 27 Mar 2006 23:11:33 +0000 (UTC)
	(envelope-from ache@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CE9F343D45;
	Mon, 27 Mar 2006 23:11:32 +0000 (GMT)
	(envelope-from ache@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2RNBW64060648;
	Mon, 27 Mar 2006 23:11:32 GMT
	(envelope-from ache@repoman.freebsd.org)
Received: (from ache@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2RNBWWU060647;
	Mon, 27 Mar 2006 23:11:32 GMT (envelope-from ache)
Message-Id: <200603272311.k2RNBWWU060647@repoman.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Mon, 27 Mar 2006 23:11:32 +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/libreadline complete.c display.c
 readline.h shell.c terminal.c util.c vi_mode.c
 src/contrib/libreadline/doc readline.3
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, 27 Mar 2006 23:11:33 -0000

ache        2006-03-27 23:11:32 UTC

  FreeBSD src repository

  Modified files:
    contrib/libreadline  complete.c display.c readline.h shell.c 
                         terminal.c util.c vi_mode.c 
    contrib/libreadline/doc readline.3 
  Log:
  Resolve conflicts
  
  Revision  Changes    Path
  1.12      +46 -26    src/contrib/libreadline/complete.c
  1.9       +169 -100  src/contrib/libreadline/display.c
  1.11      +19 -6     src/contrib/libreadline/doc/readline.3
  1.17      +38 -25    src/contrib/libreadline/readline.h
  1.10      +22 -15    src/contrib/libreadline/shell.c
  1.8       +59 -20    src/contrib/libreadline/terminal.c
  1.11      +19 -3     src/contrib/libreadline/util.c
  1.5       +304 -102  src/contrib/libreadline/vi_mode.c