plasma-framework/examples/applets/windowthumbnails
l10n daemon script 3dac19023c 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-02-02 10:51:53 +00:00
..
contents/ui use the Id, not the wid 2014-03-05 16:09:54 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-02 10:51:53 +00:00