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

12 years ago · fe543da590
parent 24b310b782 e12e91180d
commit fe543da590
1 changed files with 2 additions and 2 deletions
--- a/src/desktop/UBDesktopPalette.cpp
+++ b/src/desktop/UBDesktopPalette.cpp
@ -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;