l10n daemon script cd6f56a443 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"		2018-08-11 05:34:25 +02:00
..
qml
test
CMakeLists.txt
compositing.cpp
compositing.h
compositing.ui
config-compiler.h.cmake
config-prefix.h.cmake
effectconfig.cpp
effectconfig.h
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-11 05:34:25 +02:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
main.cpp
Messages.sh
model.cpp	[kcmkwin/compositing] Move show desktop effects to their own category	2018-08-02 16:32:57 +03:00
model.h