Julian Oes 7f32c01a1d Merge branch 'master' into new_state_machine ...

Conflicts:
	apps/controllib/fixedwing.cpp

2013-03-22 08:57:26 -07:00

..

.context

Fresh import of the PX4 firmware sources.

2012-08-04 15:12:36 -07:00

calibration_routines.c

Code style

2013-01-11 07:42:09 +01:00

calibration_routines.h

Code style

2013-01-11 07:42:09 +01:00

commander.c

Merge branch 'master' into new_state_machine

2013-03-22 08:57:26 -07:00

commander.h

Minor fixes, pushing WIP

2012-12-29 11:00:15 +01:00

Makefile

Porting to new param interface, updated mixers

2012-08-20 23:52:13 +02:00

state_machine_helper.c

Checkpoint: More state machine fixes, commited to wrong branch and now copied over

2013-03-11 10:39:57 -07:00

state_machine_helper.h

Checkpoint: Added flag checks inside navigation state update

2013-02-22 09:32:49 -08:00