Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Aug 2008 06:21:07 +0000 (23:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Aug 2008 06:21:07 +0000 (23:21 -0700)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Allow safely calling nukefile from a run queue handler

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
index d093a39506798c750cc838f0085f6721e0f733a9,087c4ac733be4b788751d0bae5b7aad22ce0dd99..087c4ac733be4b788751d0bae5b7aad22ce0dd99
mode 100644,100755..100644
--- 2/gitk