From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Dec 2009 23:38:42 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.6-rc2~2
X-Git-Url: http://git.tremily.us/?p=git.git;a=commitdiff_plain;h=47344eee9b980a7cf2a08d040ff3dd38c6cd82ec

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix selection of tags
  gitk: Default to the system colours on Windows
  gitk: Update Japanese translation
  gitk: Fix "git gui blame" invocation when called from top-level directory
  gitk: Disable checkout of remote branches
  gitk: Improve appearance of radiobuttons and checkbuttons
  gitk: Skip translation of "wrong Tcl version" message
  gitk: Add Japanese translation
  gitk: Use the --submodule option for displaying diffs when available
  gitk: Fix diffing committed -> staged (typo in diffcmd)
  gitk: Add configuration for UI colour scheme
  gitk: Don't compare fake children when comparing commits
  gitk: Show diff of commits at end of compare-commits output
  gitk: Add a user preference to enable/disable use of themed widgets
  gitk: Fix errors in the theme patch
  gitk: Use themed tk widgets
  gitk: Restore scrolling position of diff pane on back/forward in history
---

47344eee9b980a7cf2a08d040ff3dd38c6cd82ec
diff --cc gitk-git/gitk
index a0214b700,364c7a84c..364c7a84c
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
diff --cc gitk-git/po/ja.po
index 000000000,c0c92addb..c0c92addb
mode 000000,100644..100644
--- a/gitk-git/po/ja.po
+++ b/gitk-git/po/ja.po