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

Conflicts: plasma/applet.cpp
2013-01-10 16:36:35 +01:00 · 2013-01-10 16:36:35 +01:00 · 9212e9fecc
commit 9212e9fecc
parent 76c6c3e483 463d467f85
1 changed files with 0 additions and 1 deletions
--- a/applet.cpp
+++ b/applet.cpp
@ -1256,7 +1256,6 @@ bool Applet::isContainment() const
 // PRIVATE CLASS IMPLEMENTATION


-
 void ContainmentPrivate::checkRemoveAction()
 {
    q->enableAction("remove", q->immutability() == Mutable);