From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 6 Feb 2010 05:22:59 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.7.0-rc2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04bf4483eab68301f44b912b3364db6d07542c72;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix copyright symbol in About box message
---

04bf4483eab68301f44b912b3364db6d07542c72
diff --cc gitk-git/gitk
index 48cfce3a0,1f36a3e81..1f36a3e81
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk