Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
commitd60a6a662fac58f833efde93c962314fd5d83541
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Jul 2007 05:37:42 +0000 (13 22:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Jul 2007 05:37:42 +0000 (13 22:37 -0700)
tree9d1455afcd85545f6edd092d88d00aa389f3c37f
parent793ad04198a79c14094bd1311a9c42f1293c6183
parent6ebedabf2d0f77c2c765ecc5effee1a7e3ffdedb
Merge branch 'master' of git://git./gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix bug introduced by previous commit