Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	plasma/applet.cpp
This commit is contained in:
David Faure 2013-01-10 16:36:35 +01:00
commit 9212e9fecc

View File

@ -1256,7 +1256,6 @@ bool Applet::isContainment() const
// PRIVATE CLASS IMPLEMENTATION
void ContainmentPrivate::checkRemoveAction()
{
q->enableAction("remove", q->immutability() == Mutable);