Merged in APM config tree

2ba6578d · Lorenz Meier · 27274cd8 · d88d49f6 · 2ba6578d · 2ba6578d
Commit 2ba6578d authored Aug 02, 2013 by Lorenz Meier
--- a/src/ui/configuration/SerialSettingsDialog.cc
+++ b/src/ui/configuration/SerialSettingsDialog.cc
--- a/src/ui/configuration/SerialSettingsDialog.h
+++ b/src/ui/configuration/SerialSettingsDialog.h
--- a/src/ui/configuration/SerialSettingsDialog.ui
+++ b/src/ui/configuration/SerialSettingsDialog.ui
--- a/src/ui/configuration/SonarConfig.cc
+++ b/src/ui/configuration/SonarConfig.cc
--- a/src/ui/configuration/StandardParamConfig.cc
+++ b/src/ui/configuration/StandardParamConfig.cc
--- a/src/ui/configuration/StandardParamConfig.h
+++ b/src/ui/configuration/StandardParamConfig.h
--- a/src/ui/configuration/TerminalConsole.cc
+++ b/src/ui/configuration/TerminalConsole.cc
--- a/src/ui/configuration/console.cpp
+++ b/src/ui/configuration/console.cpp
--- a/src/ui/configuration/console.h
+++ b/src/ui/configuration/console.h
--- a/src/ui/configuration/terminalconsole.cpp
+++ b/src/ui/configuration/terminalconsole.cpp
--- a/src/ui/configuration/terminalconsole.h
+++ b/src/ui/configuration/terminalconsole.h
--- a/src/ui/configuration/terminalconsole.ui
+++ b/src/ui/configuration/terminalconsole.ui
--- a/src/ui/uas/UASQuickView.cc
+++ b/src/ui/uas/UASQuickView.cc
--- a/src/ui/uas/UASQuickView.h
+++ b/src/ui/uas/UASQuickView.h
--- a/src/ui/uas/UASQuickView.ui
+++ b/src/ui/uas/UASQuickView.ui
--- a/src/ui/uas/UASQuickViewItem.h
+++ b/src/ui/uas/UASQuickViewItem.h
--- a/src/ui/uas/UASQuickViewTextItem.cc
+++ b/src/ui/uas/UASQuickViewTextItem.cc
--- a/src/ui/uas/UASQuickViewTextItem.h
+++ b/src/ui/uas/UASQuickViewTextItem.h