l10n daemon script 99237c9b3f 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"		2015-06-01 10:08:03 +00:00
..
qml	[kcmkwin/compositing] Drop not used qml based ui	2015-02-04 14:44:30 +01:00
test
.reviewboardrc
CMakeLists.txt	Fix build due to undefined reference	2014-12-07 22:01:15 +01:00
compositing.cpp
compositing.h
compositing.ui	[kcmkwin/compositing] Fix ordering of items in keep window thumbnail combo box	2015-02-04 14:05:16 +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
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-16 10:12:25 +00:00
kwineffect.knsrc	Fix installation of GHNS material	2015-03-13 15:51:20 +01:00
main.cpp	[kcmkwin/compositing] Fix ordering of items in keep window thumbnail combo box	2015-02-04 14:05:16 +01:00
Messages.sh
model.cpp
model.h