l10n daemon script 45719a25db 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-01-24 08:34:15 +01:00
..
qml	[kcmkwin/compositing] Port Effects KCM to QQC2	2019-01-06 16:09:07 -07:00
test	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00
CMakeLists.txt	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00
compositing.cpp	[kcmkwin/compositing] Do not write GLPlatformInterface config	2017-04-04 19:38:02 +02:00
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	2019-01-24 08:34:15 +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	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00
model.h	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00