kdeconnect-kde/app
l10n daemon script 0899923dbc 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-06-16 13:33:29 +00:00
..
qml Experimental frontend 2015-06-13 01:30:38 +02:00
CMakeLists.txt Add desktop file for kcapp 2015-06-13 20:35:09 +02:00
main.cpp Experimental frontend 2015-06-13 01:30:38 +02:00
org.kde.kdeconnect.app.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-06-16 13:33:29 +00:00
resources.qrc Experimental frontend 2015-06-13 01:30:38 +02:00