54 commits

Author	SHA1	Message	Date
l10n daemon script	2d56c59386	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"	2016-09-14 09:17:50 +00:00
Frederik Schwarzer	471148f6ab	Fix wording.	2016-06-02 21:04:02 +02:00
Aleix Pol	e7578cc129	Refactor capabilities together with Albert ... He is committing a similar patch to kdeconnect-android	2016-05-31 17:16:01 +02:00
Albert Vaca	0b5fbe00bb	Split plugins for sending and receiving notifications ... CCMAIL: holger.k@elberer.de	2016-05-25 12:49:13 -06:00