Skip to content
Commit e8be99c2 authored by Thomas Gubler's avatar Thomas Gubler
Browse files

Merge remote-tracking branch 'upstream/master' into hil_quad 

Conflicts:
	src/comm/QGCFlightGearLink.cc
parents e390874c 562c3d2c
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