Merge branch 'pt/gitk'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 22:06:25 +0000 (15:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 22:06:25 +0000 (15:06 -0700)
commitca2b71a00b47e47990b3a196c9ae26ac6b19e287
tree51ee3a65becf81b5baf0cfda182ae2f86e1bc091
parentd82829b6128263951569221ca0c00dd143da055c
parent39ddf99c1db8b230ec7bdefc6ce3c769d1cf4ab6
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
gitk-git/gitk