Commit fe543da5 authored by Claudio Valerio's avatar Claudio Valerio

Merge remote-tracking branch 'origin/develop' into claudio-dev

parents 24b310b7 e12e9118
......@@ -23,9 +23,9 @@
UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalette)
: UBActionPalette(Qt::TopLeftCorner, parent)
, rightPalette(_rightPalette)
, mShowHideAction(0)
, mDisplaySelectAction(0)
, rightPalette(_rightPalette)
{
QList<QAction*> actions;
......@@ -239,4 +239,4 @@ void UBDesktopPalette::parentResized()
}
moveInsideParent(p);
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment