Commit Graph

54 Commits

Author SHA1 Message Date
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
94070a6aec make preview naming consistent with template name
This will allow to install the template correctly, once
https://git.reviewboard.kde.org/r/126226/ is in.
2015-12-03 02:28:58 +01:00
l10n daemon script
faca537924 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-02 08:47:47 +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