From: Johannes Sixt <j6t@kdbg.org>
Date: Fri, 1 Aug 2025 16:36:15 +0000 (+0200)
Subject: Merge branch 'ml/abandon-old-version'
X-Git-Tag: v2.51.0-rc1~10^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e51b17efec3206a10bd164a21d4e37bb9db19f6e;p=thirdparty%2Fgit.git

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>
---

e51b17efec3206a10bd164a21d4e37bb9db19f6e