From owner-cvs-src@FreeBSD.ORG  Sun Dec 30 11:15:47 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 A61BE16A418;
	Sun, 30 Dec 2007 11:15:47 +0000 (UTC)
	(envelope-from rafan@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D8F513C447;
	Sun, 30 Dec 2007 11:15:47 +0000 (UTC)
	(envelope-from rafan@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 lBUBFlNH000236;
	Sun, 30 Dec 2007 11:15:47 GMT
	(envelope-from rafan@repoman.freebsd.org)
Received: (from rafan@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUBFkQS000235;
	Sun, 30 Dec 2007 11:15:46 GMT (envelope-from rafan)
Message-Id: <200712301115.lBUBFkQS000235@repoman.freebsd.org>
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Sun, 30 Dec 2007 11:15:46 +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/ncurses/ncurses/tinfo lib_baudrate.c
 lib_raw.c lib_termcap.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, 30 Dec 2007 11:15:47 -0000

rafan       2007-12-30 11:15:46 UTC

  FreeBSD src repository

  Modified files:
    contrib/ncurses/ncurses/tinfo lib_baudrate.c lib_raw.c 
                                  lib_termcap.c 
  Log:
  - Resolve conflicts
  - Our changes in lib_termcap.c is now merged in upstream
  
  Revision  Changes    Path
  1.3       +20 -7     src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c
  1.8       +4 -4      src/contrib/ncurses/ncurses/tinfo/lib_raw.c
  1.13      +31 -31    src/contrib/ncurses/ncurses/tinfo/lib_termcap.c