l10n daemon script 6b0d2fc027 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-06-18 05:35:02 +02:00
..
qml	kcmkwincompositing: Remove space in front of ellipsis	2017-10-16 18:49:09 +03:00
test	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
CMakeLists.txt	Honor BUILD_TESTING	2018-05-31 12:06:55 +03:00
compositing.cpp	[kcmkwin/compositing] Do not write GLPlatformInterface config	2017-04-04 19:38:02 +02:00
compositing.h	Drop OpenGL based color correction from KWin	2016-11-22 07:16:51 +01:00
compositing.ui	Drop OpenGL based color correction from KWin	2016-11-22 07:16:51 +01:00
config-compiler.h.cmake
config-prefix.h.cmake
effectconfig.cpp
effectconfig.h
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:35:02 +02:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:35:02 +02:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:35:02 +02:00
main.cpp	Convert EffectView to a QQuickWidget	2018-03-05 21:57:33 +01:00
Messages.sh
model.cpp	Convert EffectView to a QQuickWidget	2018-03-05 21:57:33 +01:00
model.h	Convert EffectView to a QQuickWidget	2018-03-05 21:57:33 +01:00