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	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
CMakeLists.txt	[effects] Make scripted effects GHNS-able	2018-09-28 20:17:30 +03:00
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	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 07:12:23 +02:00
main.cpp	Fix compile when we use QT_NO_NARROWING_CONVERSIONS_IN_CONNECT flags	2018-09-17 13:43:18 +02:00
Messages.sh
model.cpp	[effects] Move Fade, Glide, and Scale effect into exclusive group	2018-11-15 19:02:00 +02:00
model.h	Convert EffectView to a QQuickWidget	2018-03-05 21:57:33 +01:00