summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-06-29 13:16:13 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-06-29 13:16:13 (GMT)
commit731108158440f16956981d9111cdda7bd5593f13 (patch)
tree54b0d73fde21c74aa6918daf51d5d8be76fdf489
parentf5a587a8d6e8dba92e49c48569eb5d1ff1a3a641 (diff)
parent22d9a275de6676c097e323284da1e19ae11a45f5 (diff)
downloadtcl-731108158440f16956981d9111cdda7bd5593f13.zip
tcl-731108158440f16956981d9111cdda7bd5593f13.tar.gz
tcl-731108158440f16956981d9111cdda7bd5593f13.tar.bz2
Merge 8.6
-rw-r--r--.fossil-settings/ignore-glob1
-rw-r--r--.gitignore3
2 files changed, 4 insertions, 0 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 51c422e..a58aef5 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -1,6 +1,7 @@
*.a
*.dll
*.dylib
+*.dylib.E
*.exe
*.exp
*.la
diff --git a/.gitignore b/.gitignore
index 701419b..33579cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*.bundle
*.dll
*.dylib
+*.dylib.E
*.exe
*.exp
*.lib
@@ -14,6 +15,7 @@
.fslckout
Makefile
Tcl-Info.plist
+Tclsh-Info.plist
autom4te.cache
config.cache
config.log
@@ -59,4 +61,5 @@ win/*.manifest
win/pkgs/*
win/coffbase.txt
win/tcl.hpj
+win/nmakehlp.out
win/nmhlp-out.txt