Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Sat, 6 Feb 2010 05:22:59 +0000 (21:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 6 Feb 2010 05:22:59 +0000 (21:22 -0800)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix copyright symbol in About box message

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
index 48cfce3,1f36a3e..1f36a3e
mode 100644,100755..100644
--- 2/gitk