l10n daemon script ba0b34c755 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-11-22 06:02:11 +01:00
..
qml	[KCMs] move GHNS buttons to the normal location	2018-10-31 07:29:22 -06:00
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-11-22 06:02:11 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwineffect.knsrc
main.cpp
Messages.sh
model.cpp	[effects] Move Fade, Glide, and Scale effect into exclusive group	2018-11-15 19:02:00 +02:00
model.h