l10n daemon script 53f2e78b5b 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"		2018-04-19 05:16:12 +02:00
..
qml	SMS App: Note that there's no device available on the combo	2018-04-08 02:40:40 +02:00
CMakeLists.txt	Optionally include sms app	2018-03-25 20:48:38 +02:00
main.cpp	Optionally include sms app	2018-03-25 20:48:38 +02:00
org.kde.kdeconnect.sms.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-19 05:16:12 +02:00
resources.qrc	Optionally include sms app	2018-03-25 20:48:38 +02:00