From owner-cvs-contrib  Wed Oct  1 06:34:39 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id GAA13318
          for cvs-contrib-outgoing; Wed, 1 Oct 1997 06:34:39 -0700 (PDT)
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 GAA13250;
          Wed, 1 Oct 1997 06:33:11 -0700 (PDT)
From: Poul-Henning Kamp <phk@FreeBSD.ORG>
Received: (from phk@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id GAA08082;
	Wed, 1 Oct 1997 06:27:34 -0700 (PDT)
Date: Wed, 1 Oct 1997 06:27:34 -0700 (PDT)
Message-Id: <199710011327.GAA08082@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/tcl/doc expr.n src/contrib/tcl/unix
         configure
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

phk         1997/10/01 06:27:33 PDT

  Modified files:
    contrib/tcl/doc      expr.n 
    contrib/tcl/unix     configure 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.6       +4 -2      src/contrib/tcl/doc/expr.n
  1.4       +155 -91   src/contrib/tcl/unix/configure