src/ui/uas · 0e58853b294e82f9bb03d4695daf0cff11bdf12e · Valentin Platzgummer / qgroundcontrol

Merge branch 'connStatus' of github.com:Susurrus/qgroundcontrol into connStatus · d4425e06

Bryant authored Jun 10, 2013

Conflicts:
	src/ui/QGCVehicleConfig.cc
	src/ui/QGCVehicleConfig.h
	src/ui/QGCVehicleConfig.ui
	src/ui/uas/UASControlWidget.cc
	src/ui/uas/UASListWidget.h
	src/ui/uas/UASQuickView.cc

d4425e06

Name	Last commit	Last update
..
QGCUnconnectedInfoWidget.cc		Loading commit data...
QGCUnconnectedInfoWidget.h		Loading commit data...
QGCUnconnectedInfoWidget.ui		Loading commit data...
UASActionsWidget.cpp		Loading commit data...
UASActionsWidget.h		Loading commit data...
UASActionsWidget.ui		Loading commit data...
UASControlParameters.cpp		Loading commit data...
UASControlParameters.h		Loading commit data...
UASControlWidget.cc		Loading commit data...
UASControlWidget.h		Loading commit data...
UASInfoWidget.cc		Loading commit data...
UASInfoWidget.h		Loading commit data...
UASListWidget.cc		Loading commit data...
UASListWidget.h		Loading commit data...
UASQuickView.cc		Loading commit data...
UASQuickView.h		Loading commit data...
UASQuickView.ui		Loading commit data...
UASQuickViewGaugeItem.cc		Loading commit data...
UASQuickViewGaugeItem.h		Loading commit data...
UASQuickViewItem.cc		Loading commit data...
UASQuickViewItem.h		Loading commit data...
UASQuickViewItemSelect.cc		Loading commit data...
UASQuickViewItemSelect.h		Loading commit data...
UASQuickViewItemSelect.ui		Loading commit data...
UASQuickViewTextItem.cc		Loading commit data...
UASQuickViewTextItem.h		Loading commit data...
UASView.cc		Loading commit data...
UASView.h		Loading commit data...

Download source code

Download this directory