summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-23 09:03:27 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-23 09:03:27 (GMT)
commit587f8fa3d9cfaccb5763689ee36cd8c41efe0689 (patch)
tree970d9d15aaa94959ec418248d6e4a9ef0ff9048b /generic
parentf1d0d7967e78856e7cb13e4b48f13fe49f93d07b (diff)
parent6f191069963104ecc445087cd2869e6e6469663e (diff)
downloadtcl-587f8fa3d9cfaccb5763689ee36cd8c41efe0689.zip
tcl-587f8fa3d9cfaccb5763689ee36cd8c41efe0689.tar.gz
tcl-587f8fa3d9cfaccb5763689ee36cd8c41efe0689.tar.bz2
Merge 8.6
Update effective_tld_names.txt.gz to the latest version. Adapt .gitattributes and .fossil-settings/binary-glob to handle *.gz file transparently in fossil/git
Diffstat (limited to 'generic')
-rw-r--r--generic/tclPipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index 34b75f7..70774e7 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -413,7 +413,7 @@ TclCreatePipeline(
* at *inPipePtr. NULL means command specified
* its own input source. */
TclFile *outPipePtr, /* If non-NULL, output to the pipeline goes to
- * a pipe, unless overriden by redirection in
+ * a pipe, unless overridden by redirection in
* the command. The file id with which to read
* frome this pipe is stored at *outPipePtr.
* NULL means command specified its own output