Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2008 04:52:23 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2008 04:52:23 +0000 (21:52 -0700)
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix changing colors through Edit->Preferences

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
index 84ab02e15f6bdecdd04e8835e3aefd0875efea44,9a4d9c40cf6ec1bed01a2c2b950efb2d9887a8a5..9a4d9c40cf6ec1bed01a2c2b950efb2d9887a8a5
mode 100644,100755..100644
--- 2/gitk