l10n daemon script e40312bf5e 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-18 05:27:46 +02:00
..
qml	Do not disable paired devices in list	2018-06-12 14:27:29 +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	2018-06-18 05:27:46 +02:00
resources.qrc	kcapp: Add a presentation mode	2018-06-08 20:17:06 +02:00