l10n daemon script 58dca31212 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-10-02 05:26:15 +02:00
..
CMakeLists.txt	Optimization for executable path and resource path on macOS	2019-07-30 13:46:18 +00:00
deviceindicator.cpp	Fix sms indicator entry for macOS	2019-08-19 05:39:05 +00:00
deviceindicator.h	Enable running commands from the indicator	2019-07-20 08:23:33 +00:00
Info.plist	Use our own plist template, hide icon and set HighRes	2019-07-20 22:02:03 +00:00
main.cpp	reliably close daemon and indicator when quitting on Windows and MacOS	2019-09-12 17:46:10 +00:00
org.kde.kdeconnect.nonplasma.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-02 05:26:15 +02:00