Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Jan 2011 07:48:47 +0000 (23:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Jan 2011 07:48:47 +0000 (23:48 -0800)
* maint:
  Mark gitk script executable

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
index e82c6bfedea5fb9a3d768c0fa1759346c6e5e603,1b0e09a561e01c51bdc6dbced052e0c753924618..e82c6bfedea5fb9a3d768c0fa1759346c6e5e603
mode 100644,100755..100755