l10n daemon script f86c5e4a4c 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"		2015-07-03 10:06:32 +00:00
..
qml	Don't rely on Q_PROPERTY if we're inheriting QDBusAbstractInterfaceBase	2015-06-25 04:08:00 +02:00
CMakeLists.txt	Add desktop file for kcapp	2015-06-13 20:35:09 +02:00
main.cpp	Experimental frontend	2015-06-13 01:30:38 +02:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-07-03 10:06:32 +00:00
resources.qrc	Implement an MPRIS client plugin	2015-06-18 04:01:01 +02:00