52 commits

Author	SHA1	Message	Date
l10n daemon script	d4074b42fa	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-15 09:58:46 +00:00
Aleix Pol	5ccdf931a9	Add desktop file for kcapp	2015-06-13 20:35:09 +02:00