summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-17 10:04:42 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-17 10:04:42 (GMT)
commit2e3b90219eb6b3241c308d556d9b2ead4f078cfc (patch)
treeb714d37b2fb40e73f903064e33be9e135b464a42
parent033b606d4a893a9cf750fb5fb89b733aa41c3d8c (diff)
parent592e0f1dd91bee030010bd5efb84d9f6d976f22a (diff)
downloadtcl-2e3b90219eb6b3241c308d556d9b2ead4f078cfc.zip
tcl-2e3b90219eb6b3241c308d556d9b2ead4f078cfc.tar.gz
tcl-2e3b90219eb6b3241c308d556d9b2ead4f078cfc.tar.bz2
merge core-8-6-branch
-rwxr-xr-xcompat/zlib/win32/zlib1.dllbin104960 -> 105472 bytes
-rw-r--r--tests/httpd11.tcl2
2 files changed, 1 insertions, 1 deletions
diff --git a/compat/zlib/win32/zlib1.dll b/compat/zlib/win32/zlib1.dll
index 81f53ec..3196f4a 100755
--- a/compat/zlib/win32/zlib1.dll
+++ b/compat/zlib/win32/zlib1.dll
Binary files differ
diff --git a/tests/httpd11.tcl b/tests/httpd11.tcl
index 6eae2b7..7880494 100644
--- a/tests/httpd11.tcl
+++ b/tests/httpd11.tcl
@@ -8,7 +8,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require Tcl 8.6
+package require Tcl 8.6-
proc ::tcl::dict::get? {dict key} {
if {[dict exists $dict $key]} {