From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Apr 2012 22:06:25 +0000 (-0700)
Subject: Merge branch 'pt/gitk'
X-Git-Tag: v1.7.10-rc4~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca2b71a00b47e47990b3a196c9ae26ac6b19e287;p=git.git

Merge branch 'pt/gitk'

* pt/gitk:
  gitk: fix setting font display with new tabbed dialog layout.
  gitk: fix tabbed preferences construction when using tcl 8.4
---

ca2b71a00b47e47990b3a196c9ae26ac6b19e287