l10n daemon script 3dab3d74cb 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 07:46:02 +02:00
..
qml	kcmkwincompositing: Remove space in front of ellipsis	2017-10-16 18:49:09 +03:00
test	fix compilation on old gcc	2017-03-20 17:03:11 +01:00
CMakeLists.txt	Convert EffectView to a QQuickWidget	2018-03-05 21:57:33 +01: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	Fix loading of effect config plugins	2015-03-06 13:16:17 +01:00
effectconfig.h	[kcmkwin/compositing] Use Effect name as configuration window title	2014-06-12 07:22:17 +02:00
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-11 07:46:02 +02:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-22 07:44:41 +02:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-22 07:44:41 +02:00
main.cpp	Convert EffectView to a QQuickWidget	2018-03-05 21:57:33 +01:00
Messages.sh	i18n fixes	2014-07-23 03:35:36 +02:00
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