Marco Martin 12ea79b341 Merge branch 'mart/customShell' ...

Conflicts:
	examples/CMakeLists.txt
	src/plasma/pluginloader.cpp

2016-03-08 15:38:31 +01:00

..

testcontainment

Merge branch 'mart/customShell'

2016-03-08 15:38:31 +01:00

CMakeLists.txt

Install all plasma files in a prefix/share/plasma directory

2014-04-27 17:14:22 +02:00