l10n daemon script 770332dbac 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-02-25 05:32:33 +01: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
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	2017-10-13 05:05:58 +02:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-20 07:06:47 +01:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-25 05:32:33 +01:00
main.cpp	Drop OpenGL based color correction from KWin	2016-11-22 07:16:51 +01:00
Messages.sh
model.cpp
model.h