From owner-cvs-contrib  Fri Jul 25 12:51:34 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id MAA20978
          for cvs-contrib-outgoing; Fri, 25 Jul 1997 12:51:34 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id MAA20892;
          Fri, 25 Jul 1997 12:49:44 -0700 (PDT)
From: Poul-Henning Kamp <phk@FreeBSD.ORG>
Received: (from phk@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id MAA00567;
	Fri, 25 Jul 1997 12:49:22 -0700 (PDT)
Date: Fri, 25 Jul 1997 12:49:22 -0700 (PDT)
Message-Id: <199707251949.MAA00567@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/tcl README.FreeBSD src/contrib/tcl/doc
         FindExec.3 break.n continue.n expr.n unknown.n
         src/contrib/tcl/unix configure tclUnixTime.c
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

phk         1997/07/25 12:49:22 PDT

  Modified files:
    contrib/tcl          README.FreeBSD 
    contrib/tcl/doc      FindExec.3 break.n continue.n expr.n 
                         unknown.n 
    contrib/tcl/unix     configure tclUnixTime.c 
  Log:
  Resolve conflicts, seems like just one of our changes didn't make it back.
  
  Revision  Changes    Path
  1.3       +8 -0      src/contrib/tcl/README.FreeBSD
  1.5       +1 -2      src/contrib/tcl/doc/FindExec.3
  1.5       +1 -2      src/contrib/tcl/doc/break.n
  1.5       +1 -2      src/contrib/tcl/doc/continue.n
  1.5       +56 -36    src/contrib/tcl/doc/expr.n
  1.5       +1 -2      src/contrib/tcl/doc/unknown.n
  1.3       +809 -180  src/contrib/tcl/unix/configure
  1.4       +22 -3     src/contrib/tcl/unix/tclUnixTime.c