l10n daemon script b7bdc75ff9 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"		2020-09-17 06:15:05 +02:00
..
qml	[app] Add plugin settings page	2020-09-08 20:33:20 +02:00
CMakeLists.txt	rename app to kdeconnect-app	2019-09-10 17:59:30 +02:00
main.cpp	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
Messages.sh	Fix localization of app and smsapp. Patch mainly by Victor Ryzhykh.	2019-12-21 09:59:36 +02:00
org.kde.kdeconnect.app.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-17 06:15:05 +02:00
resources.qrc	[app] Add plugin settings page	2020-09-08 20:33:20 +02:00