l10n daemon script 4239b0525b 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-10-25 03:57:27 +00:00
..
qml	add i18n for consistency	2015-09-07 15:03:04 +02:00
CMakeLists.txt	Add desktop file for kcapp	2015-06-13 20:35:09 +02:00
main.cpp	Setup KDeclarative before loading the Qml file	2015-09-07 17:42:19 +02:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-25 03:57:27 +00:00
resources.qrc	Implement the touchpad forwarding into kcapp	2015-07-22 03:21:28 +02:00