alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	plasma/applet.cpp
This commit is contained in:
David Faure 2013-01-10 16:36:35 +01:00
commit 9212e9fecc
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
applet.cpp
View File

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