l10n daemon script b4e008847a 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"		2016-11-25 04:58:17 +01:00
..
qml	Show the announcedName in the qml app	2016-08-21 19:38:15 +02:00
CMakeLists.txt	Add desktop file for kcapp	2015-06-13 20:35:09 +02:00
main.cpp	Setup KDeclarative before loading the Qml file	2015-09-07 17:42:19 +02:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-25 04:58:17 +01:00
resources.qrc	Improve how we handle the different plugin pages	2016-08-21 13:05:43 +02:00