kdeconnect-kde/smsapp
l10n daemon script dc524e081e 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-06-30 05:43:37 +02:00
..
qml (WIP) Upgrade Telephony plugin to read SMS history (KDE side) 2018-06-09 13:35:26 -06:00
CMakeLists.txt (WIP) Upgrade Telephony plugin to read SMS history (KDE side) 2018-06-09 13:35:26 -06:00
conversationlistmodel.cpp (WIP) Upgrade Telephony plugin to read SMS history (KDE side) 2018-06-09 13:35:26 -06:00
conversationlistmodel.h (WIP) Upgrade Telephony plugin to read SMS history (KDE side) 2018-06-09 13:35:26 -06:00
conversationmodel.cpp (WIP) Upgrade Telephony plugin to read SMS history (KDE side) 2018-06-09 13:35:26 -06:00
conversationmodel.h (WIP) Upgrade Telephony plugin to read SMS history (KDE side) 2018-06-09 13:35:26 -06:00
main.cpp (WIP) Upgrade Telephony plugin to read SMS history (KDE side) 2018-06-09 13:35:26 -06:00
org.kde.kdeconnect.sms.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-30 05:43:37 +02:00
resources.qrc (WIP) Upgrade Telephony plugin to read SMS history (KDE side) 2018-06-09 13:35:26 -06:00