cleanup merge

This commit is contained in:
James B. Pollack 2015-10-15 15:05:34 -07:00
commit aee11d4c06
2 changed files with 2 additions and 2 deletions

View file

@ -127,7 +127,7 @@ void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget,
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
QMainWindow::addDockWidget(area, dockWidget, orientation);
QDockWidget* lastDockWidget = dockWidget;
foreach(QDockWidget* nextDockWidget, dockWidgets) {

View file

@ -7,7 +7,7 @@
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
//
#ifndef hifi_ToolWindow_h
#define hifi_ToolWindow_h