l10n daemon script 1d3368532a 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-02-26 05:29:15 +01:00
..
qml	Use ListView for plugins list	2019-02-21 17:13:28 +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	Clean up includes	2019-02-03 01:44:22 +01:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-26 05:29:15 +01:00
resources.qrc	[app] Add system volume control	2018-11-08 00:43:12 +01:00