3 Commits

Author	SHA1	Message	Date
l10n daemon script	8a21e2bb27	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-12-04 09:12:31 +00:00
l10n daemon script	67a6976f8c	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-12-03 09:40:56 +00:00
Sebastian Kügler	b2d4f3a6bc	Add basic plasmoid as example for developerguide	2015-12-03 02:45:04 +01:00