tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/daemon
History
l10n daemon script 2cb090d2c9 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"
2015-03-26 10:12:56 +00:00
..
CMakeLists.txt Remove KNotifications dependency from libkdeconnectcore 2015-03-24 12:26:37 +01:00
kdeconnect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-03-25 09:09:47 +00:00
kdeconnectd.cpp Remove KNotifications dependency from libkdeconnectcore 2015-03-24 12:26:37 +01:00
kdeconnectd.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2015-03-26 10:12:56 +00:00
Messages.sh Fully replaced KDED for autostart + dbus activation, so we work outside KDE 2015-02-23 22:12:45 -08:00
org.kde.kdeconnect.service.in Fully replaced KDED for autostart + dbus activation, so we work outside KDE 2015-02-23 22:12:45 -08:00