]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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 48cfce3a0e7cbe0148a4db3776008945e4b064b9,1f36a3e815865fcc72b171b497f5c4e341e148ee..1f36a3e815865fcc72b171b497f5c4e341e148ee
mode 100644,100755..100644
--- 2/gitk