Merge branch 'maint'

diff --git a/git-gui/.gitignore b/git-gui/.gitignore
index c714d382e87b5c18609f5934890c8b135a720262..020b86deae9ee5e258ac42b2b44c8baae7015938 100644 (file)
--- a/git-gui/.gitignore
+++ b/git-gui/.gitignore
@@ -1,3 +1,5 @@
 GIT-VERSION-FILE
+GIT-GUI-VARS
 git-citool
 git-gui
+lib/tclIndex