From owner-cvs-src@FreeBSD.ORG  Sun Dec 31 09:22:32 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 [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E19E816A407;
	Sun, 31 Dec 2006 09:22:32 +0000 (UTC)
	(envelope-from ache@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id BDCC513C465;
	Sun, 31 Dec 2006 09:22:32 +0000 (UTC)
	(envelope-from ache@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 kBV9MW5B006749;
	Sun, 31 Dec 2006 09:22:32 GMT
	(envelope-from ache@repoman.freebsd.org)
Received: (from ache@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBV9MW8O006748;
	Sun, 31 Dec 2006 09:22:32 GMT (envelope-from ache)
Message-Id: <200612310922.kBV9MW8O006748@repoman.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sun, 31 Dec 2006 09:22: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 rlconf.h terminal.c vi_mode.c
 src/contrib/libreadline/doc readline.3
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, 31 Dec 2006 09:22:33 -0000

ache        2006-12-31 09:22:31 UTC

  FreeBSD src repository

  Modified files:
    contrib/libreadline  complete.c display.c readline.h rlconf.h 
                         terminal.c vi_mode.c 
    contrib/libreadline/doc readline.3 
  Log:
  Merge conflicts
  
  Revision  Changes    Path
  1.13      +22 -16    src/contrib/libreadline/complete.c
  1.11      +140 -70   src/contrib/libreadline/display.c
  1.12      +6 -2      src/contrib/libreadline/doc/readline.3
  1.18      +6 -2      src/contrib/libreadline/readline.h
  1.8       +4 -2      src/contrib/libreadline/rlconf.h
  1.10      +40 -10    src/contrib/libreadline/terminal.c
  1.6       +46 -15    src/contrib/libreadline/vi_mode.c