l10n daemon script bb7051dd3a 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-10-18 05:38:34 +02:00
..
CMakeLists.txt	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
compositing.cpp	[kcmkwin/compositing] Hide animation speed slider on Plasma	2019-09-25 14:50:25 +01:00
compositing.h	[kcmkwin/compositing] Hide animation speed slider on Plasma	2019-09-25 14:50:25 +01:00
compositing.ui	[kcmkwin/compositing] Hide animation speed slider on Plasma	2019-09-25 14:50:25 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-18 05:38:34 +02:00
main.cpp	[kcmkwin/compositing] Hide animation speed slider on Plasma	2019-09-25 14:50:25 +01:00
Messages.sh	There's no qml folder here anymore	2019-03-19 22:04:39 +01:00