From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2008 02:31:12 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.1-rc4~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=834caf9a7b0850d5647426bcb7c4dae04d85a922;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Force the focus to the main window on Windows
  gitk: Allow unbalanced quotes/braces in commit headers
  gitk: Update German translation
  gitk: Mark forgotten strings (header sentence parts in color chooser) for translation
  gitk: Ensure that "Reset branch" menu entry is enabled
  gitk: Use check-buttons' -text property instead of separate labels
  gitk: Map / to focus the search box
  gitk: Fix bugs in blaming code
---

834caf9a7b0850d5647426bcb7c4dae04d85a922
diff --cc gitk-git/gitk
index 64a873d2e,dc2a43961..dc2a43961
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk