From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Nov 2008 23:51:11 +0000 (-0800)
Subject: Merge git://repo.or.cz/git-gui
X-Git-Tag: v1.6.1-rc1~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e13921b4f7adcc7316a76c0c4955b85b1589a65;p=git.git

Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Fix the search bar destruction handler.
  Update the po template
  git-gui: Implement automatic rescan after Tool execution.
  git-gui: Allow Tools request arguments from the user.
  git-gui: Add a Tools menu for arbitrary commands.
  git-gui: Fix the after callback execution in rescan.
  git-gui: Implement system-wide configuration handling.
  git-gui: try to provide a window icon under X
---

6e13921b4f7adcc7316a76c0c4955b85b1589a65
diff --cc git-gui/lib/tools.tcl
index 000000000,6ae63b6c7..6ae63b6c7
mode 000000,100644..100644
--- a/git-gui/lib/tools.tcl
+++ b/git-gui/lib/tools.tcl
diff --cc git-gui/lib/tools_dlg.tcl
index 000000000,5f7f08e23..5f7f08e23
mode 000000,100644..100644
--- a/git-gui/lib/tools_dlg.tcl
+++ b/git-gui/lib/tools_dlg.tcl