l10n daemon script 3d0acf15a5 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-06-27 05:13:07 +02:00
..
qml	add icons for pair, accept, reject	2019-03-26 12:30:04 +00: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	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-27 05:13:07 +02:00
resources.qrc	[app] Add system volume control	2018-11-08 00:43:12 +01:00