Merged APM config changes, reverted some really ridiculous non-programming changes

62fca265 · Lorenz Meier · b6c11a8d · 34eaf1fb · 62fca265 · 62fca265
Commit 62fca265 authored Jul 21, 2013 by Lorenz Meier
--- a/src/ui/configuration/StandardParamConfig.h
+++ b/src/ui/configuration/StandardParamConfig.h
--- a/src/ui/configuration/StandardParamConfig.ui
+++ b/src/ui/configuration/StandardParamConfig.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/UASQuickViewItemSelect.cc
+++ b/src/ui/uas/UASQuickViewItemSelect.cc
--- a/src/ui/uas/UASQuickViewItemSelect.h
+++ b/src/ui/uas/UASQuickViewItemSelect.h
--- a/src/ui/uas/UASQuickViewItemSelect.ui
+++ b/src/ui/uas/UASQuickViewItemSelect.ui
--- a/src/ui/uas/UASQuickViewTextItem.cc
+++ b/src/ui/uas/UASQuickViewTextItem.cc
--- a/src/ui/uas/UASQuickViewTextItem.h
+++ b/src/ui/uas/UASQuickViewTextItem.h