qgroundcontrol.pro · f4c1eaab06df05c6ead355dfae0579153db97064 · Valentin Platzgummer / qgroundcontrol · GitLab

Jun 10, 2013
76cea4e1
Merge branch 'integration_merge' of https://github.com/mavlink/qgroundcontrol into connStatus · 76cea4e1
Bryant authored Jun 10, 2013
```
Conflicts:
	src/uas/ArduPilotMegaMAV.h
	src/ui/uas/UASListWidget.cc
```
76cea4e1
Merge branch 'integration_merge' of https://github.com/mavlink/qgroundcontrol into connStatus
Bryant authored Jun 10, 2013
```
Conflicts:
	src/uas/ArduPilotMegaMAV.h
	src/ui/uas/UASListWidget.cc
```