l10n daemon script cd22528bab 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"		2024-05-04 01:21:06 +00:00
..
qml	Fewer bananas	2024-05-01 17:27:34 +00:00
CMakeLists.txt	Remove unused dependency	2024-03-06 22:23:25 +01:00
main.cpp	Drop Qt5-only code branches	2024-04-27 17:46:39 +02: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	2024-05-04 01:21:06 +00:00