plasma-framework/examples/applets/helloworld
l10n daemon script 793441b77b 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-12-20 12:53:44 +01:00
..
contents/ui bind setAssociatedApplicationUrls 2014-08-07 19:34:57 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00