Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into rem_mavgen

Conflicts: src/ui/MainWindow.cc

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into rem_mavgen
Conflicts: src/ui/MainWindow.cc
6a1f5f84 · Bryant · a9aa4968 · e0471245 · 6a1f5f84 · 6a1f5f84
Commit 6a1f5f84 authored Aug 05, 2014 by Bryant
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 79 additions and 270 deletions

MainWindow.cc src/ui/MainWindow.cc +79 -265

MainWindow.h src/ui/MainWindow.h +0 -5

No files found.
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -418,11 +418,6 @@ protected:

    // Center widgets
    QPointer<Linecharts> linechartWidget;
-    //QPointer<HUD> hudWidget;
-    //QPointer<QGCVehicleConfig> configWidget;
-    //QPointer<QGCMapTool> mapWidget;
-    //QPointer<XMLCommProtocolWidget> protocolWidget;
-    //QPointer<QGCDataPlot2D> dataplotWidget;
 #ifdef QGC_OSG_ENABLED
    QPointer<QWidget> q3DWidget;
 #endif