Merge pull request #70 from stig-atle/master

author tobtoht <41021257+tobtoht@users.noreply.github.com>

Sat, 7 Jan 2023 15:27:20 +0000 (15:27 +0000)

committer GitHub <noreply@github.com>

Sat, 7 Jan 2023 15:27:20 +0000 (15:27 +0000)
author tobtoht <41021257+tobtoht@users.noreply.github.com>
Sat, 7 Jan 2023 15:27:20 +0000 (15:27 +0000)
committer GitHub <noreply@github.com>
Sat, 7 Jan 2023 15:27:20 +0000 (15:27 +0000)
diff --cc src/SettingsDialog.cpp
Simple merge
diff --cc src/SettingsDialog.ui
Simple merge
diff --cc src/utils/Utils.cpp
Simple merge
diff --cc src/utils/config.cpp
Simple merge
diff --cc src/utils/config.h
Simple merge
author	tobtoht <41021257+tobtoht@users.noreply.github.com>
	Sat, 7 Jan 2023 15:27:20 +0000 (15:27 +0000)
committer	GitHub <noreply@github.com>
	Sat, 7 Jan 2023 15:27:20 +0000 (15:27 +0000)
		1	2
src/SettingsDialog.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/SettingsDialog.ui	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils/Utils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils/config.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils/config.h	patch \|	diff1 \|	diff2 \|	blob \| history