l10n daemon script b7a6b1f00e 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-07-23 05:10:46 +02:00
..
CMakeLists.txt	Don't try to use PulseAudioQt on Windows	2019-05-14 22:16:41 +02:00
findthisdevice_config.cpp	replace phonon with QtMultimedia	2019-04-30 16:24:09 +00:00
findthisdevice_config.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
findthisdevice_config.ui	New plugin: Find this device (v2, now hopefully fine for all compilers)	2018-05-15 22:15:21 +02:00
findthisdeviceplugin.cpp	Remove trailing whitespace	2019-06-12 22:17:16 +02:00
findthisdeviceplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
kdeconnect_findthisdevice.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-29 05:17:17 +02:00
kdeconnect_findthisdevice_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-23 05:10:46 +02:00