summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-10-11 12:46:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-10-11 12:46:10 (GMT)
commit37b044ce722ded83c5f7fa09696660bf54540f14 (patch)
tree44f698ca231ba753cd777ff4d3b95866b7dad159
parent9b9ef79f51faabc336eaacbafccd4b5172126de8 (diff)
parentd7304e379dccca48d1ff75b83e8d5479c5b98517 (diff)
downloadtcl-37b044ce722ded83c5f7fa09696660bf54540f14.zip
tcl-37b044ce722ded83c5f7fa09696660bf54540f14.tar.gz
tcl-37b044ce722ded83c5f7fa09696660bf54540f14.tar.bz2
Merge 8.6
-rw-r--r--.fossil-settings/ignore-glob1
-rwxr-xr-x.gitignore4
2 files changed, 5 insertions, 0 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index cd6e689..62a7a5a 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -47,6 +47,7 @@ unix/tclIndex
unix/pkgs/*
win/Debug*
win/Release*
+win/*.manifest
win/pkgs/*
win/coffbase.txt
win/tcl.hpj
diff --git a/.gitignore b/.gitignore
index 99fd07e..62a7a5a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,8 @@
*/tcltest*
*/versions.vc
*/version.vc
+*/libtcl.vfs
+*/libtcl_*.zip
html
libtommath/bn.ilg
libtommath/bn.ind
@@ -45,6 +47,8 @@ unix/tclIndex
unix/pkgs/*
win/Debug*
win/Release*
+win/*.manifest
win/pkgs/*
+win/coffbase.txt
win/tcl.hpj
win/nmhlp-out.txt