tree 05a6ce33b03d990ed8d9f6d0e8f1bca7516c5b4d
parent f61cc48d289755065813db1fbbd18e6bb0836076
parent 80dd7b44970dee7d82fa735d2e0b828051f80545
author Junio C Hamano <gitster@pobox.com> 1207630343 -0700
committer Junio C Hamano <gitster@pobox.com> 1207630343 -0700

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

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