l10n daemon script dfc606eefd 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"		2021-02-14 12:13:21 +01:00
..
CMakeLists.txt	re-add pre-baked PNG icons for kdeconnect-indicator.exe.	2020-10-31 14:46:13 +00:00
deviceindicator.cpp	Rework the battery plugin	2020-08-27 15:04:40 +00:00
deviceindicator.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
indicatorhelper.cpp	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
indicatorhelper.h	reliably kill dbus-daemon and kdeconnect-daemon using WinAPIs	2020-10-31 11:31:51 +00:00
indicatorhelper_mac.cpp	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
indicatorhelper_win.cpp	reliably kill dbus-daemon and kdeconnect-daemon using WinAPIs	2020-10-31 11:31:51 +00:00
Info.plist	Add "Send File via KDE Connect" Finder integration on macOS	2020-05-19 13:41:02 +00:00
main.cpp	UseHighDpiPixmaps in kdeconnectd and kdeconnect-indicator	2021-01-29 16:35:56 +01:00
Messages.sh	Fix i18n: extract messages	2019-12-21 16:16:33 +02:00
org.kde.kdeconnect.nonplasma.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-02-14 12:13:21 +01:00
serviceregister_mac.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
serviceregister_mac.mm	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00