l10n daemon script 26339e6d6c 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-02-13 05:52:41 +01:00
..
qml
test
.reviewboardrc
CMakeLists.txt	[autotests] Move libkwineffects/autotests to autotests/libkwineffects	2016-07-18 08:47:45 +02:00
compositing.cpp	Drop OpenGL based color correction from KWin	2016-11-22 07:16:51 +01: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-02-13 05:52:41 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-13 05:52:41 +01:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-13 05:52:41 +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	pedantic fixes	2016-07-16 13:14:44 -04:00