mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
96c2d24253
Conflicts: flight/CopterControl/Makefile flight/CopterControl/System/coptercontrol.c flight/Modules/Actuator/actuator.c flight/Modules/GPS/GPS.c flight/Modules/ManualControl/manualcontrol.c flight/Modules/Stabilization/stabilization.c flight/Modules/System/systemmod.c shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/stabilizationdesired.xml |
||
---|---|---|
.. | ||
inc | ||
battery.c |