Merge branch 'next' into corvuscorax/OP-1900_fixedwingautotakeoff_rebaserc6
commit5285689541ff281e2f5ac111412218948a9c5fda
authorCorvus Corax <corvuscorax@cybertrench.com>
Sat, 23 Apr 2016 00:08:13 +0000 (23 02:08 +0200)
committerCorvus Corax <corvuscorax@cybertrench.com>
Sat, 23 Apr 2016 00:08:13 +0000 (23 02:08 +0200)
treee025c671da768f4e363743ea4a3523fa88079543
parentd80a95fa651c1a898898475e32f5ddefa0902ba9
parent137b3b24c158751a7614a12182101c74c39c097b
Merge branch 'next' into corvuscorax/OP-1900_fixedwingautotakeoff_rebaserc6
flight/libraries/plans.c
flight/modules/System/systemmod.c
ground/gcs/src/plugins/hitl/fgsimulator.cpp
shared/uavobjectdefinition/flightmodesettings.xml