Julian Oes 591cc0ac4d Merge remote-tracking branch 'upstream/master' into new_state_machine ...

Conflicts:
	apps/commander/commander.c
	apps/uORB/topics/vehicle_status.h

2013-03-11 11:01:49 -07:00

..

block

Merge James's controllib bits into a separate library module.

2013-01-06 15:04:30 -08:00

blocks.cpp

Merge James's controllib bits into a separate library module.

2013-01-06 15:04:30 -08:00

blocks.hpp

Merge James's controllib bits into a separate library module.

2013-01-06 15:04:30 -08:00

fixedwing.cpp

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

2013-03-11 11:01:49 -07:00

fixedwing.hpp

Merge James's controllib bits into a separate library module.

2013-01-06 15:04:30 -08:00

Makefile

Fix a build breaker, remove C*HDRS as they aren't used.

2013-01-12 12:46:46 -08:00

test_params.c

Merge James's controllib bits into a separate library module.

2013-01-06 15:04:30 -08:00