From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 9 Jan 2011 07:48:47 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc2~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2cf08b6a0ab09f1b81b78a5686a632a2a602abf4;p=git.git

Merge branch 'maint'

* maint:
  Mark gitk script executable
---

2cf08b6a0ab09f1b81b78a5686a632a2a602abf4
diff --cc gitk-git/gitk
index e82c6bfed,1b0e09a56..e82c6bfed
mode 100644,100755..100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk