tree 51ee3a65becf81b5baf0cfda182ae2f86e1bc091
parent d82829b6128263951569221ca0c00dd143da055c
parent 39ddf99c1db8b230ec7bdefc6ce3c769d1cf4ab6
author Junio C Hamano <gitster@pobox.com> 1333404385 -0700
committer Junio C Hamano <gitster@pobox.com> 1333404385 -0700

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