Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
commit9656153b87d47b34986f2d77eef9199c24cbf9f6
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2007 20:27:10 +0000 (29 13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2007 20:27:10 +0000 (29 13:27 -0700)
tree775cea8cee6dafafd27ab89da6c28e95da051c3a
parent7d37b5bf4eda8b2dcca371fb4b5ebd50fed64d67
parent719c2b9d926bf2be4879015e3620d27d32f007b6
Merge branch 'master' of git://git./gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix bug causing undefined variable error when cherry-picking