l10n daemon script 622708aa63 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-08-28 03:19:52 +00:00
..
assets.qrc
CMakeLists.txt	Cleanup all occurences of QT_MAJOR_VERSION in cmake	2023-12-28 17:49:07 +01:00
kdeconnect_presenter.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-08-28 03:19:52 +00:00
Presenter.qml
presenterplugin.cpp	Drop Qt5-only code branches	2024-04-27 17:46:39 +02:00
presenterplugin.h	Simplify KDEConnectPlugin::recievePacket	2023-08-03 20:49:44 +02:00
test.qml