tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/settings
History
l10n daemon script 201be5d898 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"
2020-03-16 10:21:09 +01:00
..
CMakeLists.txt Move settings app into own folder and make it a KDBusService 2020-01-17 01:32:56 +01:00
main.cpp Move settings app into own folder and make it a KDBusService 2020-01-17 01:32:56 +01:00
Messages.sh Move settings app into own folder and make it a KDBusService 2020-01-17 01:32:56 +01:00
org.kde.kdeconnect.settings.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-16 10:21:09 +01:00