l10n daemon script f9db1e0fa5 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-09-22 12:23:31 +00:00
..
qml
CMakeLists.txt
main.cpp
org.kde.kdeconnect.app.desktop
resources.qrc