From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Feb 2010 23:52:28 +0000 (-0800)
Subject: Merge git://repo.or.cz/git-gui
X-Git-Tag: v1.7.0-rc2^0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8051a030617cf7d083568cca223bdaa15052c33f;p=git.git

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

* git://repo.or.cz/git-gui:
  git-gui: update french translation
  git-gui: update Japanese translation
  git-gui: fix shortcut for menu "Commit/Revert Changes"
  git-gui: Quote git path when starting another gui in a submodule
  git-gui: update Italian translation
  git-gui: Update Swedish translation (520t0f0u)
  git-gui: use themed tk widgets with Tk 8.5
  git-gui: Update German translation (12 new or changed strings).
  git-gui: Update translation template
  git-gui: Remove unused icon file_parttick
  git-gui: use different icon for new and modified files in the index
  git-gui: set GIT_DIR and GIT_WORK_TREE after setup
  git-gui: update shortcut tools to use _gitworktree
  git-gui: handle bare repos correctly
  git-gui: handle non-standard worktree locations
  git-gui: Support applying a range of changes at once
  git-gui: Add a special diff popup menu for submodules
  git-gui: Use git diff --submodule when available
---

8051a030617cf7d083568cca223bdaa15052c33f
diff --cc git-gui/lib/themed.tcl
index 000000000,1da458673..1da458673
mode 000000,100644..100644
--- a/git-gui/lib/themed.tcl
+++ b/git-gui/lib/themed.tcl