kdeconnect-kde/kcm
l10n daemon script 392d287b64 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"
2019-08-11 04:47:22 +02:00
..
CMakeLists.txt Don't use kcmshell5 for opening the KCM 2018-12-06 23:10:05 +01:00
kcm.cpp Replace http GNU urls with https 2019-03-23 17:29:26 +01:00
kcm.h Replace http GNU urls with https 2019-03-23 17:29:26 +01:00
kcm.ui Fix ui file hint: KMessageWidget extends QFrame in KF5 times 2018-03-22 17:34:54 +01:00
kcm_kdeconnect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-11 04:47:22 +02:00
main.cpp Force usage of QStringLiteral and port remaining offenders 2019-06-10 14:40:28 +00:00
Messages.sh i18n 2013-09-04 21:19:02 +02:00
org.kde.kdeconnect.kcm.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-11 04:47:22 +02:00