summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-08-31 10:11:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-08-31 10:11:34 (GMT)
commitfbf413734dbe432b51ed64db51a13b596e7b5b09 (patch)
tree71d580e762eb8f100e04761fd0e181de32ccbc35
parent5d3664493d70daead5fdb666a27d93a34e68b974 (diff)
parent24197503b71665d1c438d2115fec33b8266f90f2 (diff)
downloadtk-fbf413734dbe432b51ed64db51a13b596e7b5b09.zip
tk-fbf413734dbe432b51ed64db51a13b596e7b5b09.tar.gz
tk-fbf413734dbe432b51ed64db51a13b596e7b5b09.tar.bz2
Merge 8.6
-rw-r--r--.fossil-settings/ignore-glob2
-rw-r--r--.gitignore2
2 files changed, 2 insertions, 2 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 632e3bf..7a72cc2 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -20,7 +20,7 @@
*/config.status
*/tkConfig.sh
*/wish*
-*/tktest*
+*/tktest
*/versions.vc
*/version.vc
*/libtk.vfs
diff --git a/.gitignore b/.gitignore
index 33f0e0d..77ed6f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ manifest.uuid
_FOSSIL_
*/tkConfig.sh
*/wish*
-*/tktest*
+*/tktest
*/versions.vc
*/version.vc
*/libtk.vfs