l10n daemon script cc43a72884 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"		2017-07-14 05:43:50 +02:00
..
qml	Change how we specify devices	2017-05-18 11:45:28 +02:00
CMakeLists.txt	Add desktop file for kcapp	2015-06-13 20:35:09 +02:00
main.cpp	Name of the app	2017-02-08 14:58:31 +01:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-14 05:43:50 +02:00
resources.qrc	Improve how we handle the different plugin pages	2016-08-21 13:05:43 +02:00