From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Apr 2008 04:52:23 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.5~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fae09a8084c9b51632726523b477a78dd28d7d7e;p=git.git

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix changing colors through Edit->Preferences
---

fae09a8084c9b51632726523b477a78dd28d7d7e
diff --cc gitk-git/gitk
index 84ab02e15,9a4d9c40c..9a4d9c40c
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk