qgroundcontrol.pri · e0635aeaa2b77701f54614200062dc0a7666d522 · Valentin Platzgummer / qgroundcontrol · GitLab

Feb 15, 2012
e0635aea
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol · e0635aea
Bryant Mairs authored Feb 15, 2012
```
Conflicts:
	qgroundcontrol.pri
	src/uas/UAS.cc
```
e0635aea
Merge branch 'master' of https://github.com/mavlink/qgroundcontrol
Bryant Mairs authored Feb 15, 2012
```
Conflicts:
	qgroundcontrol.pri
	src/uas/UAS.cc
```