From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Aug 2008 06:21:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.0~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0d74d160f3d416be8f7fbfd18fee0eebf40d8e0;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Allow safely calling nukefile from a run queue handler
---

a0d74d160f3d416be8f7fbfd18fee0eebf40d8e0
diff --cc gitk-git/gitk
index d093a3950,087c4ac73..087c4ac73
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk