Marco Martin 12ea79b341 Merge branch 'mart/customShell' ... Conflicts: examples/CMakeLists.txt src/plasma/pluginloader.cpp		2016-03-08 15:38:31 +01:00
..
contents/ui	make the example containment REALLY simple	2015-11-26 18:16:35 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-06 09:49:14 +00:00