l10n daemon script d3c2d52c3b 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"		2023-11-07 02:12:13 +00:00
..
qml	Port to FormCard	2023-09-15 16:10:47 +00:00
CMakeLists.txt	Fix runcommand page not being able to be displayed in Qt6	2023-07-25 18:29:38 +02:00
main.cpp	Set bugreport address for kdeconnect-app	2023-10-24 20:30:04 +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	2023-11-07 02:12:13 +00:00
resources.qrc.in	Fix runcommand page not being able to be displayed in Qt6	2023-07-25 18:29:38 +02:00