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

Mar 05, 2011
ff627ad3
Merge branch 'experimental' of git://github.com/amolinap/qgroundcontrol into experimental · ff627ad3
Mariano Lizarraga authored Mar 05, 2011
```
Conflicts:
	qgroundcontrol.pro
	src/ui/MainWindow.cc
	src/ui/SlugsDataSensorView.ui
```
ff627ad3
Merge branch 'experimental' of git://github.com/amolinap/qgroundcontrol into experimental
Mariano Lizarraga authored Mar 05, 2011
```
Conflicts:
	qgroundcontrol.pro
	src/ui/MainWindow.cc
	src/ui/SlugsDataSensorView.ui
```