l10n daemon script bb32691980 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"		2019-07-31 05:23:00 +02:00
..
CMakeLists.txt	[kcmkwin] Split out Desktop Effects KCM	2019-03-18 13:08:32 +02:00
compositing.cpp	Port away from deprecated qSort function	2019-07-10 00:00:29 +03:00
compositing.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
compositing.ui
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 05:23:00 +02:00
main.cpp	[kcmkwin] Split out Desktop Effects KCM	2019-03-18 13:08:32 +02:00
Messages.sh	There's no qml folder here anymore	2019-03-19 22:04:39 +01:00