l10n daemon script 6bb9f6db7b 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-11-17 13:07:36 +00:00
..
qml	[kcmeffects] Do not use root context properties	2015-10-21 13:28:16 +02:00
test
.reviewboardrc
CMakeLists.txt
compositing.cpp
compositing.h
compositing.ui
config-compiler.h.cmake
config-prefix.h.cmake
effectconfig.cpp
effectconfig.h
kcmkwineffects.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-17 13:07:36 +00:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-17 13:07:36 +00:00
kwineffect.knsrc
main.cpp
Messages.sh
model.cpp	[kcmeffects] Do not use root context properties	2015-10-21 13:28:16 +02:00
model.h	[kcmeffects] Do not use root context properties	2015-10-21 13:28:16 +02:00