From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Aug 2008 20:32:12 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.0-rc2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=847d10f56d7853cd0e139a7c2e6ad0ad2de5c464;p=thirdparty%2Fgit.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Update swedish translation.
  gitk: Updated German translation
  gitk: Fallback to selecting the head commit upon load
  gitk: Fixed automatic row selection during load
  gitk: Fixed broken exception handling in diff
  gitk: On Windows, use a Cygwin-specific flag for kill
  gitk: Arrange to kill diff-files & diff-index on quit
  gitk: Kill back-end processes on window close
---

847d10f56d7853cd0e139a7c2e6ad0ad2de5c464
diff --cc gitk-git/gitk
index fddcb45817,d093a39506..d093a39506
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk