l10n daemon script b830c8f33b 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"		2019-12-19 05:49:03 +01:00
..
CMakeLists.txt	[app] Add system volume control	2018-11-08 00:43:12 +01:00
kdeconnect_remotesystemvolume.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-19 05:49:03 +01:00
remotesystemvolumeplugin.cpp	Use K_PLUGIN_CLASS_WITH_JSON	2019-06-12 22:16:54 +02:00
remotesystemvolumeplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00