tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/sfos
History
l10n daemon script d3a6284f3c 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"
2018-08-03 05:36:50 +02:00
..
qml Build kdeconnect on sailfish and port some simple plugins 2018-08-02 20:10:59 +01:00
rpm Build kdeconnect on sailfish and port some simple plugins 2018-08-02 20:10:59 +01:00
CMakeLists.txt Build kdeconnect on sailfish and port some simple plugins 2018-08-02 20:10:59 +01:00
kdeconnect-sfos.cpp Build kdeconnect on sailfish and port some simple plugins 2018-08-02 20:10:59 +01:00
kdeconnect-sfos.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-03 05:36:50 +02:00
kdeconnectd.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-03 05:36:50 +02:00
org.kde.kdeconnect.service.in Build kdeconnect on sailfish and port some simple plugins 2018-08-02 20:10:59 +01:00
sailfishdaemon.cpp Build kdeconnect on sailfish and port some simple plugins 2018-08-02 20:10:59 +01:00