Merged

qgroundcontrol.pro

settings/ParameterList.xml

src/Core.cc

src/comm/MAVLinkXMLParser.cc

src/comm/OpalLink.cc

src/comm/OpalLink.h

src/comm/OpalRT.cc

src/comm/OpalRT.h

src/comm/Parameter.cc

src/comm/Parameter.h

src/comm/ParameterList.cc

src/comm/ParameterList.h

src/comm/QGCParamID.cc

src/comm/QGCParamID.h

src/uas/UAS.cc

src/ui/CommConfigurationWindow.cc

src/ui/MainWindow.cc

src/ui/MainWindow.ui

src/ui/OpalLinkConfigurationWindow.cc

src/ui/OpalLinkConfigurationWindow.h