Merge branch 'maint'

* maint:
  git-gui: Don't delete send on Windows as it doesn't exist

diff --cc git-gui.sh
index 36ba849cc85bc801662d26e6169b822368e8ef7f,e221d5b511dbcbed5c6142634810d98ba08e2449..afee777f1c0100f5606669d1a3372acb0a206b06
--- 1/git-gui.sh
--- 2/git-gui.sh
+++ b/git-gui.sh
@@@ -42,26 -42,8 +42,26 @@@ if {[catch {package require Tcl 8.4} er
        exit 1
  }
  
- rename send {} ; # What an evil concept...
+ catch {rename send {}} ; # What an evil concept...
  
 +######################################################################
 +##
 +## locate our library
 +
 +set oguilib {@@GITGUI_LIBDIR@@}
 +set oguirel {@@GITGUI_RELATIVE@@}
 +if {$oguirel eq {1}} {
 +      set oguilib [file dirname [file dirname [file normalize $argv0]]]
 +      set oguilib [file join $oguilib share git-gui lib]
 +      set oguimsg [file join $oguilib msgs]
 +} elseif {[string match @@* $oguirel]} {
 +      set oguilib [file join [file dirname [file normalize $argv0]] lib]
 +      set oguimsg [file join [file dirname [file normalize $argv0]] po]
 +} else {
 +      set oguimsg [file join $oguilib msgs]
 +}
 +unset oguirel
 +
  ######################################################################
  ##
  ## enable verbose loading?