01f4cf59ea
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"
=== What === This is a generic shell that can be embedded in any KDE application which supports KParts to provide easy capabilities to add a plasma-based dashboard to their application. === How can I use this code? === See http://techbase.kde.org/Development/Tutorials/Plasma/ApplicationShell