l10n daemon script fc13865911 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-11-10 04:50:10 +01:00
..
CMakeLists.txt	Add icon to executable for Windows and Mac	2017-05-24 22:57:37 +02:00
deviceindicator.cpp	Fix warning	2017-09-18 20:07:33 +02:00
deviceindicator.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
main.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
org.kde.kdeconnect.nonplasma.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-10 04:50:10 +01:00