Skip to content
Commit ff627ad3 authored by Mariano Lizarraga's avatar Mariano Lizarraga
Browse files

Merge branch 'experimental' of git://github.com/amolinap/qgroundcontrol into experimental 

Conflicts:
	qgroundcontrol.pro
	src/ui/MainWindow.cc
	src/ui/SlugsDataSensorView.ui
parents 3732645d c84b1d0e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment