l10n daemon script f4211e0431 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"		2021-04-22 01:12:28 +00:00
..
qml	Add missing license headers	2021-02-27 20:04:47 +01:00
CMakeLists.txt	Default to qqc2-desktop-style and add it as runtime dependency	2021-03-18 23:47:22 +00:00
main.cpp	Default to qqc2-desktop-style and add it as runtime dependency	2021-03-18 23:47:22 +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	2021-04-22 01:12:28 +00:00
resources.qrc	[app] Add plugin settings page	2020-09-08 20:33:20 +02:00