Julian Oes 561ec495b7 Merge branch 'new_state_machine_drton' of github.com:DrTon/Firmware into new_state_machine_drton ...

Conflicts:
	Documentation/flight_mode_state_machine.odg

2013-08-15 10:43:11 +02:00

..

drivers

Merge branch 'master' into new_state_machine_drton

2013-08-15 10:33:45 +02:00

examples

Renamed actuator_safety back to actuator_armed, compiling but untested

2013-07-15 22:15:15 +02:00

include

VA args now supported by MAVLink text messages

2013-05-21 09:14:22 +02:00

modules

Merge branch 'new_state_machine_drton' of github.com:DrTon/Firmware into new_state_machine_drton

2013-08-15 10:43:11 +02:00

systemcmds

Merge branch 'master' into new_state_machine_drton

2013-08-15 10:33:45 +02:00