plasma-framework/examples/containments
l10n daemon script d2fba8a760 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"
2019-12-09 05:18:11 +01:00
..
testcontainment SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-09 05:18:11 +01:00
CMakeLists.txt Install all plasma files in a prefix/share/plasma directory 2014-04-27 17:14:22 +02:00