2 Commits

Author	SHA1	Message	Date
l10n daemon script	06be5c64f7	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-01 10:29:52 +00:00
Marco Martin	46789eb1c8	add a couple of plasmoid templates for kapptemplate/kdevelop ... this makes easier to develop a new plasmoid, there are two templates: one is for a pure QML plasmoid the othe rone has a C++ part	2015-11-30 15:02:43 +01:00