l10n daemon script 866dfb4e89 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-01-14 07:04:00 +01:00
..
CMakeLists.txt	KCM KWinCompositing implement KCModuleData to highlight default at module level	2020-12-17 13:21:23 +00:00
compositing.ui	platforms/x11: Always set swap interval to 1	2021-01-07 13:10:59 +00:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwincompositing_setting.kcfg	platforms/x11: Always set swap interval to 1	2021-01-07 13:10:59 +00:00
kwincompositing_setting.kcfgc	KCM/Compositing: Use KConfig XT to store values	2020-03-30 09:14:25 +02:00
kwincompositingdata.cpp	KCM KWinCompositing implement KCModuleData to highlight default at module level	2020-12-17 13:21:23 +00:00
kwincompositingdata.h	KCM KWinCompositing implement KCModuleData to highlight default at module level	2020-12-17 13:21:23 +00:00
main.cpp	platforms/x11: Always set swap interval to 1	2021-01-07 13:10:59 +00:00
Messages.sh	GIT_SILENT Fix scripty failing	2020-04-21 23:11:15 +02:00