sneedium 2a1dcd6a38 fix conflicts ... Signed-off-by: sneedium <sneed@sneedmc.org>		2022-06-14 22:36:08 -04:00
..
dialogs	fix conflicts	2022-06-14 22:36:08 -04:00
instanceview	fix: Only trigger rename on KeyPress	2022-04-19 18:43:51 +05:30
pagedialog	NOISSUE continue reshuffling the codebase	2021-11-22 03:55:16 +01:00
pages	fix conflicts	2022-06-14 22:36:08 -04:00
setupwizard	Add migration wizard, fix migration from custom paste instance	2022-05-21 17:30:19 +01:00
themes	NOISSUE continue reshuffling the codebase	2021-11-22 03:55:16 +01:00
widgets	fix conflicts	2022-06-14 22:36:08 -04:00
ColorCache.cpp	NOISSUE continue reshuffling the codebase	2021-11-22 03:55:16 +01:00
ColorCache.h	NOISSUE continue reshuffling the codebase	2021-11-22 03:55:16 +01:00
GuiUtil.cpp	chore: add license headers	2022-06-12 13:50:58 +02:00
GuiUtil.h	NOISSUE continue reshuffling the codebase	2021-11-22 03:55:16 +01:00
InstanceWindow.cpp	NOISSUE continue reshuffling the codebase	2021-11-22 03:55:16 +01:00
InstanceWindow.h	NOISSUE continue reshuffling the codebase	2021-11-22 03:55:16 +01:00
MainWindow.cpp	fix conflicts	2022-06-14 22:36:08 -04:00
MainWindow.h	Merge remote-tracking branch 'upstream/develop' into develop	2022-06-14 21:29:00 -04:00