plasma-framework/examples/containments
l10n daemon script 13dc03991d 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-06 09:49:14 +00:00
..
testcontainment SVN_SILENT made messages (.desktop file) - always resolve ours 2016-02-06 09:49:14 +00:00
CMakeLists.txt Install all plasma files in a prefix/share/plasma directory 2014-04-27 17:14:22 +02:00