Merge branch 'config' of github.com:mavlink/qgroundcontrol into config

a2e3e1bb · Lorenz Meier · 1ce28cb9 · a225878a · a2e3e1bb · a2e3e1bb
Commit a2e3e1bb authored Sep 13, 2013 by Lorenz Meier
--- a/src/ui/QGCPX4VehicleConfig.cc
+++ b/src/ui/QGCPX4VehicleConfig.cc
--- a/src/ui/QGCPX4VehicleConfig.ui
+++ b/src/ui/QGCPX4VehicleConfig.ui
--- a/src/ui/QGCToolBar.cc
+++ b/src/ui/QGCToolBar.cc
--- a/src/ui/QGCToolBar.h
+++ b/src/ui/QGCToolBar.h
--- a/src/ui/px4_configuration/QGCPX4AirframeConfig.cc
+++ b/src/ui/px4_configuration/QGCPX4AirframeConfig.cc