From owner-cvs-contrib  Thu Nov 27 11:56:07 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id LAA18794
          for cvs-contrib-outgoing; Thu, 27 Nov 1997 11:56:07 -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 LAA18502;
          Thu, 27 Nov 1997 11:52:52 -0800 (PST)
          (envelope-from pst@FreeBSD.ORG)
From: Paul Traina <pst@FreeBSD.ORG>
Received: (from pst@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id LAA21355;
	Thu, 27 Nov 1997 11:52:46 -0800 (PST)
Date: Thu, 27 Nov 1997 11:52:46 -0800 (PST)
Message-Id: <199711271952.LAA21355@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
         expr.n src/contrib/tcl/unix configure tclUnixTime.c
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

pst         1997/11/27 11:52:46 PST

  Modified files:
    contrib/tcl          README.FreeBSD 
    contrib/tcl/doc      expr.n 
    contrib/tcl/unix     configure tclUnixTime.c 
  Log:
  Resolve merge conflicts.
  
  Revision  Changes    Path
  1.4       +8 -0      src/contrib/tcl/README.FreeBSD
  1.7       +5 -4      src/contrib/tcl/doc/expr.n
  1.5       +86 -49    src/contrib/tcl/unix/configure
  1.5       +1 -1      src/contrib/tcl/unix/tclUnixTime.c