l10n daemon script e873eddcde 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-06-17 14:06:59 +02:00
..
qml	[app/mousepad] Prevent page change during input	2020-06-16 17:59:36 +02:00
CMakeLists.txt	rename app to kdeconnect-app	2019-09-10 17:59:30 +02:00
main.cpp	It alreadys added by kaboutdata	2020-01-12 14:46:21 +01: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-06-17 14:06:59 +02:00
resources.qrc	[app/mpris] Support non-seekable players	2019-07-17 21:19:53 +00:00