3 commits

Author	SHA1	Message	Date
l10n daemon script	9f291d9ef7	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-10-02 10:15:24 +00:00
Aleix Pol	00914240a5	Merge branch 'stable'	2015-09-15 01:45:00 +02:00
Aleix Pol	d1d196a15d	Use correct notation for desktop file names	2015-09-15 01:29:39 +02:00

Renamed from kdeconnect-non-plasma.desktop (Browse further)