Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Mar 2009 06:20:52 +0000 (22:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Mar 2009 06:20:52 +0000 (22:20 -0800)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix possible infinite loop and display corruption

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
index dc2a439618ffd92a92d9ca954a8597ba31875dab,1773ae63eb54f3b602b782a3633034aab2f828ae..1773ae63eb54f3b602b782a3633034aab2f828ae
mode 100644,100755..100644
--- 2/gitk