Merge git://git.kernel.org/pub/scm/gitk/gitk
commitf8c62880ef22b74ea6df47bb349ff0743d2a93f9
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Mar 2009 06:20:52 +0000 (1 22:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Mar 2009 06:20:52 +0000 (1 22:20 -0800)
tree52900d781aadcb373e4fd38d2679a2c5c0204edc
parentf474c526618d5d1111b585a6344e012fb731d3fe
parent52b8ea934ecd24b52806188b53367aaa6185deb3
Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix possible infinite loop and display corruption
gitk-git/gitk