From owner-cvs-contrib  Mon Sep 29 01:59:55 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id BAA28774
          for cvs-contrib-outgoing; Mon, 29 Sep 1997 01:59:55 -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 BAA28724;
          Mon, 29 Sep 1997 01:59:03 -0700 (PDT)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id BAA14876;
	Mon, 29 Sep 1997 01:53:43 -0700 (PDT)
Date: Mon, 29 Sep 1997 01:53:43 -0700 (PDT)
Message-Id: <199709290853.BAA14876@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/opie - Imported sources
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1997/09/29 01:53:43 PDT

  src/contrib/opie - Imported sources
  Update of /home/ncvs/src/contrib/opie
  In directory freefall.freebsd.org:/c/ache/opie
  
  Log Message:
  Upgrade to 2.31
  
  Status:
  
  Vendor Tag:	NRL
  Release Tags:	v2_31
  		
  U src/contrib/opie/INSTALL
  U src/contrib/opie/License.TIN
  U src/contrib/opie/README
  U src/contrib/opie/Makefile.in
  U src/contrib/opie/acconfig.h
  U src/contrib/opie/config.h.in
  U src/contrib/opie/config.testeflag
  U src/contrib/opie/configure
  U src/contrib/opie/configure.in
  U src/contrib/opie/glob.c
  U src/contrib/opie/configure.munger.in
  U src/contrib/opie/ftpcmd.y
  C src/contrib/opie/opie.4
  U src/contrib/opie/install-sh
  C src/contrib/opie/opie.h
  C src/contrib/opie/opie_cfg.h
  U src/contrib/opie/opieaccess.5
  U src/contrib/opie/opieftpd.8
  U src/contrib/opie/opieftpd.c
  U src/contrib/opie/opiegen.1
  U src/contrib/opie/opiegen.c
  C src/contrib/opie/opieinfo.1
  U src/contrib/opie/opieinfo.c
  C src/contrib/opie/opiekey.1
  U src/contrib/opie/opiekey.c
  U src/contrib/opie/opiekeys.5
  U src/contrib/opie/opielogin.1
  U src/contrib/opie/opielogin.c
  C src/contrib/opie/opiepasswd.1
  U src/contrib/opie/opiepasswd.c
  U src/contrib/opie/opieserv.1
  U src/contrib/opie/opieserv.c
  U src/contrib/opie/opiesu.1
  U src/contrib/opie/BUG-REPORT
  U src/contrib/opie/opietest.c
  U src/contrib/opie/permsfile.c
  U src/contrib/opie/popen.c
  U src/contrib/opie/opiesu.c
  U src/contrib/opie/COPYRIGHT.NRL
  C src/contrib/opie/config.h
  U src/contrib/opie/libmissing/Makefile.in
  U src/contrib/opie/libmissing/bogus.c
  U src/contrib/opie/libmissing/endutent.c
  U src/contrib/opie/libmissing/getutline.c
  U src/contrib/opie/libmissing/pututline.c
  U src/contrib/opie/libopie/writerec.c
  U src/contrib/opie/libopie/accessfile.c
  U src/contrib/opie/libopie/atob8.c
  U src/contrib/opie/libopie/btoa8.c
  U src/contrib/opie/libopie/btoe.c
  U src/contrib/opie/libopie/btoh.c
  U src/contrib/opie/libopie/challenge.c
  C src/contrib/opie/libopie/generator.c
  U src/contrib/opie/libopie/getsequence.c
  U src/contrib/opie/libopie/getutmpentry.c
  C src/contrib/opie/libopie/hash.c
  C src/contrib/opie/libopie/hashlen.c
  U src/contrib/opie/libopie/insecure.c
  U src/contrib/opie/libopie/keycrunch.c
  U src/contrib/opie/libopie/lock.c
  U src/contrib/opie/libopie/login.c
  N src/contrib/opie/libopie/logwtmp.c
  U src/contrib/opie/libopie/lookup.c
  U src/contrib/opie/libopie/md4c.c
  U src/contrib/opie/libopie/md5c.c
  U src/contrib/opie/libopie/newseed.c
  U src/contrib/opie/libopie/open.c
  U src/contrib/opie/libopie/parsechallenge.c
  U src/contrib/opie/libopie/passcheck.c
  U src/contrib/opie/libopie/passwd.c
  U src/contrib/opie/libopie/randomchallenge.c
  U src/contrib/opie/libopie/readpass.c
  U src/contrib/opie/libopie/readrec.c
  U src/contrib/opie/libopie/unlock.c
  U src/contrib/opie/libopie/verify.c
  U src/contrib/opie/libopie/version.c
  U src/contrib/opie/libopie/Makefile.in
  
  10 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jNRL:yesterday -jNRL src/contrib/opie
  

From owner-cvs-contrib  Mon Sep 29 03:38:50 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id DAA03497
          for cvs-contrib-outgoing; Mon, 29 Sep 1997 03:38:50 -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 DAA03475;
          Mon, 29 Sep 1997 03:38:36 -0700 (PDT)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id DAA15820;
	Mon, 29 Sep 1997 03:33:16 -0700 (PDT)
Date: Mon, 29 Sep 1997 03:33:16 -0700 (PDT)
Message-Id: <199709291033.DAA15820@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/opie config.h opie.4 opie.h opie_cfg.h
         opieinfo.1 opiekey.1 opiepasswd.1 src/contrib/opie/libopie
         generator.c hash.c hashlen.c
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1997/09/29 03:33:15 PDT

  Modified files:
    contrib/opie         config.h opie.4 opie.h opie_cfg.h 
                         opieinfo.1 opiekey.1 opiepasswd.1 
    contrib/opie/libopie generator.c hash.c hashlen.c 
  Log:
  Merge
  
  Revision  Changes    Path
  1.2       +73 -16    src/contrib/opie/config.h
  1.4       +2 -8      src/contrib/opie/opie.4
  1.3       +19 -30    src/contrib/opie/opie.h
  1.3       +38 -23    src/contrib/opie/opie_cfg.h
  1.3       +2 -2      src/contrib/opie/opieinfo.1
  1.3       +2 -2      src/contrib/opie/opiekey.1
  1.3       +2 -2      src/contrib/opie/opiepasswd.1
  1.3       +12 -36    src/contrib/opie/libopie/generator.c
  1.3       +26 -16    src/contrib/opie/libopie/hash.c
  1.3       +2 -2      src/contrib/opie/libopie/hashlen.c

From owner-cvs-contrib  Mon Sep 29 03:44:26 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id DAA03736
          for cvs-contrib-outgoing; Mon, 29 Sep 1997 03:44:26 -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 DAA03695;
          Mon, 29 Sep 1997 03:43:47 -0700 (PDT)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id DAA15873;
	Mon, 29 Sep 1997 03:38:26 -0700 (PDT)
Date: Mon, 29 Sep 1997 03:38:26 -0700 (PDT)
Message-Id: <199709291038.DAA15873@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/opie logwtmp.c
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1997/09/29 03:38:26 PDT

  Removed files:
    contrib/opie         logwtmp.c 
  Log:
  Moved to libopie

From owner-cvs-contrib  Mon Sep 29 03:48:26 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id DAA03876
          for cvs-contrib-outgoing; Mon, 29 Sep 1997 03:48:26 -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 DAA03852;
          Mon, 29 Sep 1997 03:48:07 -0700 (PDT)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id DAA15913;
	Mon, 29 Sep 1997 03:42:47 -0700 (PDT)
Date: Mon, 29 Sep 1997 03:42:47 -0700 (PDT)
Message-Id: <199709291042.DAA15913@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/opie options.h
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1997/09/29 03:42:47 PDT

  Removed files:
    contrib/opie         options.h 
  Log:
  Not used in this version

From owner-cvs-contrib  Mon Sep 29 04:04:34 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id EAA04667
          for cvs-contrib-outgoing; Mon, 29 Sep 1997 04:04:34 -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 EAA04637;
          Mon, 29 Sep 1997 04:04:15 -0700 (PDT)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id DAA16040;
	Mon, 29 Sep 1997 03:58:55 -0700 (PDT)
Date: Mon, 29 Sep 1997 03:58:55 -0700 (PDT)
Message-Id: <199709291058.DAA16040@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/opie opie.h
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1997/09/29 03:58:55 PDT

  Modified files:
    contrib/opie         opie.h 
  Log:
  Oops, __END_DECLS was in wrong place
  
  Revision  Changes    Path
  1.4       +1 -1      src/contrib/opie/opie.h

From owner-cvs-contrib  Mon Sep 29 04:36:53 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id EAA05806
          for cvs-contrib-outgoing; Mon, 29 Sep 1997 04:36:53 -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 EAA05784;
          Mon, 29 Sep 1997 04:36:43 -0700 (PDT)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id EAA17406;
	Mon, 29 Sep 1997 04:31:22 -0700 (PDT)
Date: Mon, 29 Sep 1997 04:31:22 -0700 (PDT)
Message-Id: <199709291131.EAA17406@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/opie/libmissing - Imported sources
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1997/09/29 04:31:22 PDT

  src/contrib/opie/libmissing - Imported sources
  Update of /home/ncvs/src/contrib/opie/libmissing
  In directory freefall.freebsd.org:/c/ache/x/contrib_opie/libmissing
  
  Log Message:
  Add setutent.c
  
  Status:
  
  Vendor Tag:	NRL
  Release Tags:	v2_31
  		
  U src/contrib/opie/libmissing/Makefile.in
  U src/contrib/opie/libmissing/bogus.c
  U src/contrib/opie/libmissing/endutent.c
  U src/contrib/opie/libmissing/getutline.c
  U src/contrib/opie/libmissing/pututline.c
  N src/contrib/opie/libmissing/setutent.c
  
  No conflicts created by this import
  

From owner-cvs-contrib  Wed Oct  1 06:08:31 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id GAA12054
          for cvs-contrib-outgoing; Wed, 1 Oct 1997 06:08:31 -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 GAA11991;
          Wed, 1 Oct 1997 06:07:59 -0700 (PDT)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id GAA06616;
	Wed, 1 Oct 1997 06:02:22 -0700 (PDT)
Date: Wed, 1 Oct 1997 06:02:22 -0700 (PDT)
Message-Id: <199710011302.GAA06616@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/opie config.h
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1997/10/01 06:02:22 PDT

  Modified files:
    contrib/opie         config.h 
  Log:
  Move locks from /etc/opielocks to /var/run/opielocks to keep
  /etc  non-writeable as possible
  
  Revision  Changes    Path
  1.3       +1 -1      src/contrib/opie/config.h

From owner-cvs-contrib  Wed Oct  1 06:25:31 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id GAA12807
          for cvs-contrib-outgoing; Wed, 1 Oct 1997 06:25:31 -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 GAA12766;
          Wed, 1 Oct 1997 06:24:54 -0700 (PDT)
From: Poul-Henning Kamp <phk@FreeBSD.ORG>
Received: (from phk@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id GAA07816;
	Wed, 1 Oct 1997 06:19:17 -0700 (PDT)
Date: Wed, 1 Oct 1997 06:19:17 -0700 (PDT)
Message-Id: <199710011319.GAA07816@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/tcl - Imported sources
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

phk         1997/10/01 06:19:16 PDT

  src/contrib/tcl - Imported sources
  Update of /home/ncvs/src/contrib/tcl
  In directory freefall.freebsd.org:/c/phk/tcl8.0
  
  Log Message:
  Upgrade to 8.0 release.
  
  Status:
  
  Vendor Tag:	TCL
  Release Tags:	tcl8_0
  		
  U src/contrib/tcl/changes
  U src/contrib/tcl/README
  U src/contrib/tcl/license.terms
  U src/contrib/tcl/unix/README
  U src/contrib/tcl/unix/tclAppInit.c
  U src/contrib/tcl/unix/tclLoadAix.c
  U src/contrib/tcl/unix/tclLoadAout.c
  U src/contrib/tcl/unix/tclLoadDl.c
  U src/contrib/tcl/unix/tclLoadDld.c
  U src/contrib/tcl/unix/tclLoadNext.c
  U src/contrib/tcl/unix/tclLoadOSF.c
  U src/contrib/tcl/unix/tclLoadShl.c
  U src/contrib/tcl/unix/tclMtherr.c
  U src/contrib/tcl/unix/tclUnixChan.c
  U src/contrib/tcl/unix/tclUnixEvent.c
  U src/contrib/tcl/unix/tclUnixFCmd.c
  U src/contrib/tcl/unix/tclUnixFile.c
  U src/contrib/tcl/unix/tclUnixInit.c
  U src/contrib/tcl/unix/tclUnixNotfy.c
  U src/contrib/tcl/unix/tclUnixPipe.c
  U src/contrib/tcl/unix/tclUnixSock.c
  U src/contrib/tcl/unix/tclUnixTest.c
  U src/contrib/tcl/unix/tclUnixTime.c
  U src/contrib/tcl/unix/Makefile.in
  U src/contrib/tcl/unix/tclXtTest.c
  U src/contrib/tcl/unix/tclUnixPort.h
  C src/contrib/tcl/unix/configure
  U src/contrib/tcl/unix/configure.in
  U src/contrib/tcl/unix/tclConfig.sh.in
  U src/contrib/tcl/unix/install-sh
  U src/contrib/tcl/unix/porting.notes
  I src/contrib/tcl/unix/porting.old
  U src/contrib/tcl/unix/ldAix
  U src/contrib/tcl/unix/mkLinks
  U src/contrib/tcl/unix/dltest/pkga.c
  U src/contrib/tcl/unix/dltest/pkgb.c
  U src/contrib/tcl/unix/dltest/pkgc.c
  U src/contrib/tcl/unix/dltest/pkgd.c
  U src/contrib/tcl/unix/dltest/pkge.c
  U src/contrib/tcl/unix/dltest/pkgf.c
  U src/contrib/tcl/unix/dltest/Makefile.in
  U src/contrib/tcl/unix/dltest/configure.in
  U src/contrib/tcl/unix/dltest/configure
  U src/contrib/tcl/unix/dltest/README
  U src/contrib/tcl/generic/panic.c
  U src/contrib/tcl/generic/regexp.c
  N src/contrib/tcl/generic/tclAlloc.c
  U src/contrib/tcl/generic/tclAsync.c
  U src/contrib/tcl/generic/tclBasic.c
  U src/contrib/tcl/generic/tclBinary.c
  U src/contrib/tcl/generic/tclCkalloc.c
  U src/contrib/tcl/generic/tclClock.c
  U src/contrib/tcl/generic/tclCmdAH.c
  U src/contrib/tcl/generic/tclCmdIL.c
  U src/contrib/tcl/generic/tclCmdMZ.c
  U src/contrib/tcl/generic/tclCompExpr.c
  U src/contrib/tcl/generic/tclCompile.c
  U src/contrib/tcl/generic/tclDate.c
  U src/contrib/tcl/generic/tclEnv.c
  U src/contrib/tcl/generic/tclEvent.c
  U src/contrib/tcl/generic/tclExecute.c
  U src/contrib/tcl/generic/tclFCmd.c
  U src/contrib/tcl/generic/tclFileName.c
  U src/contrib/tcl/generic/tclGet.c
  U src/contrib/tcl/generic/tclHash.c
  U src/contrib/tcl/generic/tclHistory.c
  U src/contrib/tcl/generic/tclIO.c
  U src/contrib/tcl/generic/tclIOCmd.c
  U src/contrib/tcl/generic/tclIOSock.c
  U src/contrib/tcl/generic/tclIOUtil.c
  U src/contrib/tcl/generic/tclIndexObj.c
  U src/contrib/tcl/generic/tclInterp.c
  U src/contrib/tcl/generic/tclLink.c
  U src/contrib/tcl/generic/tclListObj.c
  U src/contrib/tcl/generic/tclLoad.c
  U src/contrib/tcl/generic/tclLoadNone.c
  U src/contrib/tcl/generic/tclMain.c
  U src/contrib/tcl/generic/tclNamesp.c
  U src/contrib/tcl/generic/tclNotify.c
  U src/contrib/tcl/generic/tclObj.c
  U src/contrib/tcl/generic/tclParse.c
  U src/contrib/tcl/generic/tclPipe.c
  U src/contrib/tcl/generic/tclPkg.c
  U src/contrib/tcl/generic/tclPosixStr.c
  U src/contrib/tcl/generic/tclPreserve.c
  U src/contrib/tcl/generic/tclProc.c
  U src/contrib/tcl/generic/tclStringObj.c
  U src/contrib/tcl/generic/tclTest.c
  U src/contrib/tcl/generic/tclTestObj.c
  U src/contrib/tcl/generic/tclTimer.c
  U src/contrib/tcl/generic/tclUtil.c
  U src/contrib/tcl/generic/tclVar.c
  U src/contrib/tcl/generic/tcl.h
  U src/contrib/tcl/generic/tclCompile.h
  U src/contrib/tcl/generic/tclInt.h
  N src/contrib/tcl/generic/tclMath.h
  U src/contrib/tcl/generic/tclPort.h
  U src/contrib/tcl/generic/tclRegexp.h
  U src/contrib/tcl/generic/README
  U src/contrib/tcl/generic/tclGetDate.y
  U src/contrib/tcl/library/license.terms
  N src/contrib/tcl/library/history.tcl
  U src/contrib/tcl/library/init.tcl
  U src/contrib/tcl/library/ldAout.tcl
  U src/contrib/tcl/library/parray.tcl
  N src/contrib/tcl/library/safe.tcl
  U src/contrib/tcl/library/word.tcl
  U src/contrib/tcl/library/tclIndex
  N src/contrib/tcl/library/http2.0/http.tcl
  N src/contrib/tcl/library/http2.0/pkgIndex.tcl
  U src/contrib/tcl/library/http1.0/http.tcl
  U src/contrib/tcl/library/http1.0/pkgIndex.tcl
  N src/contrib/tcl/library/opt0.1/optparse.tcl
  N src/contrib/tcl/library/opt0.1/pkgIndex.tcl
  U src/contrib/tcl/doc/license.terms
  U src/contrib/tcl/doc/AddErrInfo.3
  U src/contrib/tcl/doc/Alloc.3
  U src/contrib/tcl/doc/AllowExc.3
  U src/contrib/tcl/doc/AppInit.3
  U src/contrib/tcl/doc/AssocData.3
  U src/contrib/tcl/doc/Async.3
  U src/contrib/tcl/doc/BackgdErr.3
  U src/contrib/tcl/doc/Backslash.3
  U src/contrib/tcl/doc/BoolObj.3
  U src/contrib/tcl/doc/CallDel.3
  U src/contrib/tcl/doc/CmdCmplt.3
  U src/contrib/tcl/doc/Concat.3
  U src/contrib/tcl/doc/CrtChannel.3
  U src/contrib/tcl/doc/CrtChnlHdlr.3
  U src/contrib/tcl/doc/CrtCloseHdlr.3
  U src/contrib/tcl/doc/CrtCommand.3
  U src/contrib/tcl/doc/CrtFileHdlr.3
  U src/contrib/tcl/doc/CrtInterp.3
  U src/contrib/tcl/doc/CrtMathFnc.3
  U src/contrib/tcl/doc/CrtObjCmd.3
  U src/contrib/tcl/doc/CrtSlave.3
  U src/contrib/tcl/doc/CrtTimerHdlr.3
  U src/contrib/tcl/doc/CrtTrace.3
  U src/contrib/tcl/doc/DString.3
  U src/contrib/tcl/doc/DetachPids.3
  U src/contrib/tcl/doc/DoOneEvent.3
  U src/contrib/tcl/doc/DoWhenIdle.3
  U src/contrib/tcl/doc/DoubleObj.3
  U src/contrib/tcl/doc/Eval.3
  U src/contrib/tcl/doc/EvalObj.3
  U src/contrib/tcl/doc/Exit.3
  U src/contrib/tcl/doc/ExprLong.3
  U src/contrib/tcl/doc/ExprLongObj.3
  U src/contrib/tcl/doc/FindExec.3
  U src/contrib/tcl/doc/GetIndex.3
  U src/contrib/tcl/doc/GetInt.3
  U src/contrib/tcl/doc/GetOpnFl.3
  U src/contrib/tcl/doc/GetStdChan.3
  U src/contrib/tcl/doc/Hash.3
  U src/contrib/tcl/doc/IntObj.3
  U src/contrib/tcl/doc/Interp.3
  U src/contrib/tcl/doc/LinkVar.3
  U src/contrib/tcl/doc/ListObj.3
  U src/contrib/tcl/doc/Notifier.3
  U src/contrib/tcl/doc/ObjSetVar.3
  U src/contrib/tcl/doc/Object.3
  U src/contrib/tcl/doc/ObjectType.3
  U src/contrib/tcl/doc/OpenFileChnl.3
  U src/contrib/tcl/doc/OpenTcp.3
  U src/contrib/tcl/doc/PkgRequire.3
  U src/contrib/tcl/doc/Preserve.3
  U src/contrib/tcl/doc/PrintDbl.3
  N src/contrib/tcl/doc/RecEvalObj.3
  U src/contrib/tcl/doc/RecordEval.3
  U src/contrib/tcl/doc/RegExp.3
  U src/contrib/tcl/doc/SetErrno.3
  U src/contrib/tcl/doc/SetRecLmt.3
  U src/contrib/tcl/doc/SetResult.3
  U src/contrib/tcl/doc/SetVar.3
  U src/contrib/tcl/doc/Sleep.3
  U src/contrib/tcl/doc/SplitList.3
  U src/contrib/tcl/doc/SplitPath.3
  U src/contrib/tcl/doc/StaticPkg.3
  U src/contrib/tcl/doc/StrMatch.3
  U src/contrib/tcl/doc/StringObj.3
  U src/contrib/tcl/doc/Tcl.n
  U src/contrib/tcl/doc/Tcl_Main.3
  U src/contrib/tcl/doc/TraceVar.3
  U src/contrib/tcl/doc/Translate.3
  U src/contrib/tcl/doc/UpVar.3
  U src/contrib/tcl/doc/WrongNumArgs.3
  U src/contrib/tcl/doc/after.n
  U src/contrib/tcl/doc/append.n
  U src/contrib/tcl/doc/array.n
  U src/contrib/tcl/doc/bgerror.n
  U src/contrib/tcl/doc/binary.n
  U src/contrib/tcl/doc/break.n
  U src/contrib/tcl/doc/case.n
  U src/contrib/tcl/doc/catch.n
  U src/contrib/tcl/doc/cd.n
  U src/contrib/tcl/doc/clock.n
  U src/contrib/tcl/doc/close.n
  U src/contrib/tcl/doc/concat.n
  U src/contrib/tcl/doc/continue.n
  U src/contrib/tcl/doc/eof.n
  U src/contrib/tcl/doc/error.n
  U src/contrib/tcl/doc/eval.n
  U src/contrib/tcl/doc/exec.n
  U src/contrib/tcl/doc/exit.n
  C src/contrib/tcl/doc/expr.n
  U src/contrib/tcl/doc/fblocked.n
  U src/contrib/tcl/doc/fconfigure.n
  U src/contrib/tcl/doc/fcopy.n
  U src/contrib/tcl/doc/file.n
  U src/contrib/tcl/doc/fileevent.n
  U src/contrib/tcl/doc/filename.n
  U src/contrib/tcl/doc/flush.n
  U src/contrib/tcl/doc/for.n
  U src/contrib/tcl/doc/foreach.n
  U src/contrib/tcl/doc/format.n
  U src/contrib/tcl/doc/gets.n
  U src/contrib/tcl/doc/glob.n
  U src/contrib/tcl/doc/global.n
  U src/contrib/tcl/doc/history.n
  U src/contrib/tcl/doc/http.n
  U src/contrib/tcl/doc/if.n
  U src/contrib/tcl/doc/incr.n
  U src/contrib/tcl/doc/info.n
  U src/contrib/tcl/doc/interp.n
  U src/contrib/tcl/doc/join.n
  U src/contrib/tcl/doc/lappend.n
  U src/contrib/tcl/doc/library.n
  U src/contrib/tcl/doc/lindex.n
  U src/contrib/tcl/doc/linsert.n
  U src/contrib/tcl/doc/list.n
  U src/contrib/tcl/doc/llength.n
  U src/contrib/tcl/doc/load.n
  U src/contrib/tcl/doc/lrange.n
  U src/contrib/tcl/doc/lreplace.n
  U src/contrib/tcl/doc/lsearch.n
  U src/contrib/tcl/doc/lsort.n
  U src/contrib/tcl/doc/namespace.n
  U src/contrib/tcl/doc/open.n
  U src/contrib/tcl/doc/package.n
  U src/contrib/tcl/doc/pid.n
  U src/contrib/tcl/doc/pkgMkIndex.n
  U src/contrib/tcl/doc/proc.n
  U src/contrib/tcl/doc/puts.n
  U src/contrib/tcl/doc/pwd.n
  U src/contrib/tcl/doc/read.n
  U src/contrib/tcl/doc/regexp.n
  U src/contrib/tcl/doc/registry.n
  U src/contrib/tcl/doc/regsub.n
  U src/contrib/tcl/doc/rename.n
  N src/contrib/tcl/doc/resource.n
  U src/contrib/tcl/doc/return.n
  U src/contrib/tcl/doc/safe.n
  U src/contrib/tcl/doc/scan.n
  U src/contrib/tcl/doc/seek.n
  U src/contrib/tcl/doc/set.n
  U src/contrib/tcl/doc/socket.n
  U src/contrib/tcl/doc/source.n
  U src/contrib/tcl/doc/split.n
  U src/contrib/tcl/doc/string.n
  U src/contrib/tcl/doc/subst.n
  U src/contrib/tcl/doc/switch.n
  U src/contrib/tcl/doc/tclsh.1
  U src/contrib/tcl/doc/tclvars.n
  U src/contrib/tcl/doc/tell.n
  U src/contrib/tcl/doc/time.n
  U src/contrib/tcl/doc/trace.n
  U src/contrib/tcl/doc/unknown.n
  U src/contrib/tcl/doc/unset.n
  U src/contrib/tcl/doc/update.n
  U src/contrib/tcl/doc/uplevel.n
  U src/contrib/tcl/doc/upvar.n
  U src/contrib/tcl/doc/variable.n
  U src/contrib/tcl/doc/vwait.n
  U src/contrib/tcl/doc/while.n
  U src/contrib/tcl/doc/man.macros
  U src/contrib/tcl/tests/license.terms
  U src/contrib/tcl/tests/append.test
  U src/contrib/tcl/tests/assocd.test
  U src/contrib/tcl/tests/async.test
  U src/contrib/tcl/tests/basic.test
  U src/contrib/tcl/tests/binary.test
  U src/contrib/tcl/tests/case.test
  U src/contrib/tcl/tests/clock.test
  U src/contrib/tcl/tests/cmdAH.test
  U src/contrib/tcl/tests/cmdIL.test
  U src/contrib/tcl/tests/cmdInfo.test
  U src/contrib/tcl/tests/compile.test
  U src/contrib/tcl/tests/concat.test
  U src/contrib/tcl/tests/dcall.test
  U src/contrib/tcl/tests/dstring.test
  U src/contrib/tcl/tests/env.test
  U src/contrib/tcl/tests/error.test
  U src/contrib/tcl/tests/eval.test
  U src/contrib/tcl/tests/event.test
  U src/contrib/tcl/tests/exec.test
  U src/contrib/tcl/tests/execute.test
  U src/contrib/tcl/tests/expr-old.test
  U src/contrib/tcl/tests/expr.test
  U src/contrib/tcl/tests/fCmd.test
  U src/contrib/tcl/tests/fileName.test
  U src/contrib/tcl/tests/for-old.test
  U src/contrib/tcl/tests/for.test
  U src/contrib/tcl/tests/foreach.test
  U src/contrib/tcl/tests/format.test
  U src/contrib/tcl/tests/get.test
  U src/contrib/tcl/tests/history.test
  U src/contrib/tcl/tests/http.test
  N src/contrib/tcl/tests/httpold.test
  U src/contrib/tcl/tests/if-old.test
  U src/contrib/tcl/tests/if.test
  U src/contrib/tcl/tests/incr-old.test
  U src/contrib/tcl/tests/incr.test
  U src/contrib/tcl/tests/indexObj.test
  U src/contrib/tcl/tests/info.test
  U src/contrib/tcl/tests/interp.test
  U src/contrib/tcl/tests/io.test
  U src/contrib/tcl/tests/ioCmd.test
  U src/contrib/tcl/tests/join.test
  U src/contrib/tcl/tests/lindex.test
  U src/contrib/tcl/tests/link.test
  U src/contrib/tcl/tests/linsert.test
  U src/contrib/tcl/tests/list.test
  U src/contrib/tcl/tests/listObj.test
  U src/contrib/tcl/tests/llength.test
  U src/contrib/tcl/tests/load.test
  U src/contrib/tcl/tests/lrange.test
  U src/contrib/tcl/tests/lreplace.test
  U src/contrib/tcl/tests/lsearch.test
  U src/contrib/tcl/tests/macFCmd.test
  U src/contrib/tcl/tests/misc.test
  U src/contrib/tcl/tests/namespace-old.test
  U src/contrib/tcl/tests/namespace.test
  U src/contrib/tcl/tests/obj.test
  N src/contrib/tcl/tests/opt.test
  U src/contrib/tcl/tests/osa.test
  U src/contrib/tcl/tests/parse.test
  U src/contrib/tcl/tests/pid.test
  U src/contrib/tcl/tests/pkg.test
  U src/contrib/tcl/tests/proc-old.test
  U src/contrib/tcl/tests/proc.test
  N src/contrib/tcl/tests/pwd.test
  U src/contrib/tcl/tests/regexp.test
  U src/contrib/tcl/tests/registry.test
  U src/contrib/tcl/tests/rename.test
  U src/contrib/tcl/tests/resource.test
  U src/contrib/tcl/tests/safe.test
  U src/contrib/tcl/tests/scan.test
  U src/contrib/tcl/tests/set-old.test
  U src/contrib/tcl/tests/set.test
  U src/contrib/tcl/tests/socket.test
  U src/contrib/tcl/tests/source.test
  U src/contrib/tcl/tests/split.test
  U src/contrib/tcl/tests/string.test
  U src/contrib/tcl/tests/stringObj.test
  U src/contrib/tcl/tests/subst.test
  U src/contrib/tcl/tests/switch.test
  U src/contrib/tcl/tests/timer.test
  U src/contrib/tcl/tests/trace.test
  U src/contrib/tcl/tests/unixFCmd.test
  U src/contrib/tcl/tests/unixNotfy.test
  U src/contrib/tcl/tests/unknown.test
  U src/contrib/tcl/tests/uplevel.test
  U src/contrib/tcl/tests/upvar.test
  U src/contrib/tcl/tests/util.test
  U src/contrib/tcl/tests/var.test
  U src/contrib/tcl/tests/while-old.test
  U src/contrib/tcl/tests/while.test
  U src/contrib/tcl/tests/winFCmd.test
  U src/contrib/tcl/tests/README
  U src/contrib/tcl/tests/winNotify.test
  U src/contrib/tcl/tests/winPipe.test
  U src/contrib/tcl/tests/all
  U src/contrib/tcl/tests/remote.tcl
  U src/contrib/tcl/tests/defs
  
  2 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jTCL:yesterday -jTCL src/contrib/tcl
  

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