summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorwelch <welch>2000-04-10 23:42:48 (GMT)
committerwelch <welch>2000-04-10 23:42:48 (GMT)
commitaddb5b41cfbf3a249b388a1cfdfc703c79bc8323 (patch)
tree386e411fa99167a6326458abdbeed320caf38337 /ChangeLog
parent13aec0471ffd37b75154bb25f75de7fda964de63 (diff)
downloadtcl-addb5b41cfbf3a249b388a1cfdfc703c79bc8323.zip
tcl-addb5b41cfbf3a249b388a1cfdfc703c79bc8323.tar.gz
tcl-addb5b41cfbf3a249b388a1cfdfc703c79bc8323.tar.bz2
fixed conflict in this file
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files 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 <welch@scriptics.com>
+
+ * 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 <ericm@scriptics.com>
* 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 <hobbs@scriptics.com>
-
- * 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 <welch@scriptics.com>
* lib/httpd2.1/http.tcl: Worked on the "server closes before