From addb5b41cfbf3a249b388a1cfdfc703c79bc8323 Mon Sep 17 00:00:00 2001 From: welch Date: Mon, 10 Apr 2000 23:42:48 +0000 Subject: fixed conflict in this file --- ChangeLog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5cf352..51cf6a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-04-10 Brent Welch + + * generic/tcl.h: Fixed Tcl_CreateThread declaration. + * library/tcltest1.0/tcltest.tcl: Fixed the "mainThread" + initialization to work with either testthread or the thread extension + 2000-04-10 Eric Melski * win/tclWinPipe.c (TclpCreateTempFile): Added conversion of @@ -12,12 +18,6 @@ * tests/*.test: Changed all occurances of "namespace import ::tcltest" to "namespace import -force ::tcltest" [Bug: 3948]. -2000-04-10 Jeff Hobbs - - * generic/tcl.h: removed specific typedef of Tcl_ThreadCreateProc - for Windows as the build choked. It seems to be OK using the Unix - fallback (void). - 2000-04-09 Brent Welch * lib/httpd2.1/http.tcl: Worked on the "server closes before -- cgit v0.12