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

Sep 05, 2011
76c8b7cf
Merge remote-tracking branch 'remotes/pixhawk/master' into dev_sensSoarNew · 76c8b7cf
oberion authored Sep 05, 2011
```
Conflicts:
	images/earth.html
	thirdParty/mavlink/include/common/common.h
	thirdParty/mavlink/include/common/mavlink.h
```
76c8b7cf
Merge remote-tracking branch 'remotes/pixhawk/master' into dev_sensSoarNew
oberion authored Sep 05, 2011
```
Conflicts:
	images/earth.html
	thirdParty/mavlink/include/common/common.h
	thirdParty/mavlink/include/common/mavlink.h
```