l10n daemon script f0aca93646 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"		2021-02-19 16:58:52 +01:00
..
bigscreenplugin.cpp	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
bigscreenplugin.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
CMakeLists.txt	Add Bigscreen plugin with support for Bigscreen STT packet type	2020-05-23 22:10:24 +00:00
kdeconnect_bigscreen.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-02-19 16:58:52 +01:00