l10n daemon script 7a14a0ef4d 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"		2017-05-12 05:44:57 +02:00
..
qml	[kcmeffects] Do not use root context properties	2015-10-21 13:28:16 +02:00
test	fix compilation on old gcc	2017-03-20 17:03:11 +01:00
.reviewboardrc
CMakeLists.txt	[autotests] Move libkwineffects/autotests to autotests/libkwineffects	2016-07-18 08:47:45 +02: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	2017-04-25 10:05:35 +02:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-25 10:05:35 +02:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-12 05:44:57 +02:00
main.cpp	Drop OpenGL based color correction from KWin	2016-11-22 07:16:51 +01:00
Messages.sh	i18n fixes	2014-07-23 03:35:36 +02:00
model.cpp	[kcmeffects] Do not use root context properties	2015-10-21 13:28:16 +02:00
model.h	pedantic fixes	2016-07-16 13:14:44 -04:00