Merge branch 'maint'

* maint:
git-gui: Include 'war on whitespace' fixes from git.git

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 638de99e9e793399c61cd2ceb300447324f2532a..9770b0bc27ae4dfd44f4bfcfc74946fabefdc127 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -78,5 +78,3 @@ test "$VN" = "$VC" || {
        echo >&2 "GITGUI_VERSION = $VN"
        echo "GITGUI_VERSION = $VN" >$GVF
 }
-
-

diff --git a/lib/class.tcl b/lib/class.tcl
index 88b056522a866b3acc9620218ec8dfae042d62a2..72494c1a1ea51ec004a63f08f2c62db9096c2318 100644 (file)
--- a/lib/class.tcl
+++ b/lib/class.tcl
@@ -151,4 +151,3 @@ auto_mkindex_parser::command constructor {name args} {
                [format { [list source [file join $dir %s]]} \
                [file split $scriptFile]] "\n"
 }
-