l10n daemon script 2d0f08b006 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-03-28 09:41:02 +02:00
..
qml
test	fix compilation on old gcc	2017-03-20 17:03:11 +01:00
.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	2017-03-22 05:17:38 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-28 09:41:02 +02:00
main.cpp
Messages.sh
model.cpp
model.h