plasma-framework/examples/applets/notes
l10n daemon script bba40b9b9d 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"
2017-02-05 06:07:10 +01:00
..
contents Fix notes example, svg loading was wrong 2014-02-07 03:32:20 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 06:07:10 +01:00