l10n daemon script 88516226a4 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-03-31 05:16:01 +02:00
..
qml	Reduce dependencies of smsapp to kirigami 2.2	2018-03-27 17:10:10 +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-03-31 05:16:01 +02:00
resources.qrc	Optionally include sms app	2018-03-25 20:48:38 +02:00