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)
* pt/gitk:
  gitk: fix setting font display with new tabbed dialog layout.
  gitk: fix tabbed preferences construction when using tcl 8.4

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
Simple merge