l10n daemon script 24802d9d9a SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2023-03-01 23:48:05 +00:00
..
common	kcms: Fix plugin id loading in desktop effects kcm	2023-03-01 16:05:07 +00:00
compositing
decoration
desktop
effects
options
rules	kcms/rules: Port away from Kirigami.OverlaySheet.sheetOpen	2023-03-01 14:53:15 +00:00
screenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-01 23:48:05 +00:00
scripts
tabbox
virtualkeyboard
xwayland
CMakeLists.txt