l10n daemon script 818ed8f4ad 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"		2016-12-13 05:42:59 +01:00
..
qml
test	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
.reviewboardrc
CMakeLists.txt	[autotests] Move libkwineffects/autotests to autotests/libkwineffects	2016-07-18 08:47:45 +02:00
compositing.cpp	[kcmkwin/compositing] Hide config options which don't make sense if Compositing is required	2016-09-13 15:47:42 +02:00
compositing.h	[kcmkwin/compositing] Hide config options which don't make sense if Compositing is required	2016-09-13 15:47:42 +02:00
compositing.ui	Introduce a config option whether applications are allowed to block compositing	2016-09-13 15:47:05 +02:00
config-compiler.h.cmake
config-prefix.h.cmake
effectconfig.cpp
effectconfig.h
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwineffect.knsrc
main.cpp	[kcmkwin/compositing] Hide config options which don't make sense if Compositing is required	2016-09-13 15:47:42 +02:00
Messages.sh
model.cpp
model.h	pedantic fixes	2016-07-16 13:14:44 -04:00