From owner-cvs-contrib  Mon Dec 15 15:21:56 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id PAA26288
          for cvs-contrib-outgoing; Mon, 15 Dec 1997 15:21:56 -0800 (PST)
          (envelope-from owner-cvs-contrib)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id PAA25888;
          Mon, 15 Dec 1997 15:16:27 -0800 (PST)
          (envelope-from cwt@FreeBSD.org)
From: Chris Timmons <cwt@FreeBSD.ORG>
Received: (from cwt@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id PAA20413;
	Mon, 15 Dec 1997 15:13:54 -0800 (PST)
Date: Mon, 15 Dec 1997 15:13:54 -0800 (PST)
Message-Id: <199712152313.PAA20413@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/global gtags.el src/contrib/global/btreeop
         btreeop.c src/contrib/global/htags htags.1
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

cwt         1997/12/15 15:13:54 PST

  Modified files:
    contrib/global       gtags.el 
    contrib/global/btreeop btreeop.c 
    contrib/global/htags htags.1 
  Log:
  Merge and resolve conflicts...
  
  Revision  Changes    Path
  1.3       +73 -21    src/contrib/global/gtags.el
  1.3       +176 -243  src/contrib/global/btreeop/btreeop.c
  1.3       +2 -3      src/contrib/global/htags/htags.1