Merge branch 'ml/abandon-old-version'

* ml/abandon-old-version: gitk: restore ui colors after cancelling config dialog gitk: set config dialog color swatches in one place Signed-off-by: Johannes Sixt <j6t@kdbg.org>