2 Commits (866fc3eb164920836cb3386eb3f4761e32728cba)

Author	SHA1	Message	Date
l10n daemon script	866fc3eb16	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"	3 years ago
Alexander Lohnau	3f9fdf996b	Convert desktop files of applets to json ... Task: https://phabricator.kde.org/T14564	3 years ago