l10n daemon script 7a14a0ef4d 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-05-12 05:44:57 +02:00
..
qml
test
.reviewboardrc
CMakeLists.txt
compositing.cpp	[kcmkwin/compositing] Do not write GLPlatformInterface config	2017-04-04 19:38:02 +02:00
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-04-25 10:05:35 +02:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-25 10:05:35 +02:00
kwineffect.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-12 05:44:57 +02:00
main.cpp
Messages.sh
model.cpp
model.h