plasma-framework/examples/applets/conditionalloader
l10n daemon script 7897780310 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-04-18 10:26:53 +00:00
..
contents port to new api 2014-02-04 17:29:28 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-18 10:26:53 +00:00