l10n daemon script 015672d98f 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"		2019-10-28 08:52:57 +01:00
..
qml	Change how we specify devices	2017-05-18 11:45:28 +02:00
CMakeLists.txt	Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5	2018-03-17 23:34:33 +01:00
main.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-28 08:52:57 +01:00
resources.qrc	Improve how we handle the different plugin pages	2016-08-21 13:05:43 +02:00