diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-11 19:06:15 -0400 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-11 19:06:15 -0400 |
commit | aa751960178af04673f88adca4988f94ffd7f2dc (patch) | |
tree | 614f2f7f8a688c9d838997e26edf0e0a7b3d1382 | |
parent | Merge branch 'maint' (diff) | |
parent | git-gui: Include 'war on whitespace' fixes from git.git (diff) | |
download | tgif-aa751960178af04673f88adca4988f94ffd7f2dc.tar.xz |
Merge branch 'maint'
* maint:
git-gui: Include 'war on whitespace' fixes from git.git
-rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
-rw-r--r-- | lib/class.tcl | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 638de99e9e..9770b0bc27 100755 --- 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 88b056522a..72494c1a1e 100644 --- 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" } - |