Merge git://git.kernel.org/pub/scm/gitk/gitk
commitfae09a8084c9b51632726523b477a78dd28d7d7e
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2008 04:52:23 +0000 (7 21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2008 04:52:23 +0000 (7 21:52 -0700)
tree05a6ce33b03d990ed8d9f6d0e8f1bca7516c5b4d
parentf61cc48d289755065813db1fbbd18e6bb0836076
parent80dd7b44970dee7d82fa735d2e0b828051f80545
Merge git://git.kernel.org/pub/scm/gitk/gitk

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