From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jan 2008 00:57:56 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.4-rc4~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a41acc63badf20cbb22cca61039dca9309deaa19;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: make Ctrl "+" really increase the font size
---

a41acc63badf20cbb22cca61039dca9309deaa19
diff --cc gitk-git/gitk
index b3cb8e8b7,5560e4dc5..5560e4dc5
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk