l10n daemon script d63b06d7a5 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"		2021-09-07 01:25:46 +00:00
..
CMakeLists.txt	kcm compositing: Hide preview option in Wayland	2021-09-06 12:22:20 +00:00
compositing.ui	kcm compositing: Hide preview option in Wayland	2021-09-06 12:22:20 +00:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-07 01:25:46 +00:00
kwincompositing_setting.kcfg	kcmkwin/compositing: Remove Crisp scale method	2021-07-06 12:34:59 +00:00
kwincompositing_setting.kcfgc
kwincompositingdata.cpp	Fix clazy warnings: potential Qt containter detaches in range-for loops	2021-08-23 23:03:06 +00:00
kwincompositingdata.h
main.cpp	kcm compositing: Hide preview option in Wayland	2021-09-06 12:22:20 +00:00
Messages.sh