l10n daemon script 392d287b64 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-08-11 04:47:22 +02:00
..
qml	[app] Rework sidebar header	2019-07-21 18:40:16 +00:00
CMakeLists.txt	Rename kcapp to kdeconnect	2019-07-21 11:02:24 +00:00
main.cpp	Rename kcapp to kdeconnect	2019-07-21 11:02:24 +00:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-11 04:47:22 +02:00
resources.qrc	[app/mpris] Support non-seekable players	2019-07-17 21:19:53 +00:00