l10n daemon script cb4767e60b 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-10-23 01:24:45 +00:00
..
qml	kdeconnect-app: Add filtering of plugins	2024-10-14 09:34:57 +00:00
CMakeLists.txt	kdeconnect-app: Remove PluginInfoPage wrapper	2024-10-06 11:04:44 +00:00
main.cpp	Fixing 'KColorSchemeManager::KColorSchemeManager': Since 6.6. Use KColorSchemeManager::instance()	2024-10-10 08:51:57 +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	2024-10-23 01:24:45 +00:00