l10n daemon script fbd7e6d383 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"		2017-06-21 08:21:46 +02:00
..
CMakeLists.txt	Add icon to executable for Windows and Mac	2017-05-24 22:57:37 +02:00
deviceindicator.cpp	Get the correct icon	2017-05-24 22:57:36 +02:00
deviceindicator.h	Let the menu actually do things	2016-11-23 19:45:35 +01:00
main.cpp	Don't block the process while showing the dialog	2017-05-25 00:16:05 +02:00
org.kde.kdeconnect.nonplasma.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-21 08:21:46 +02:00