Julian Oes 7f90ebf537 Merge remote-tracking branch 'upstream/master' into new_state_machine ...

Conflicts:
	src/examples/fixedwing_control/main.c

2013-06-12 12:24:52 +02:00

..

module.mk

Moved position_estimator_mc, px4io driver and sdlog app to new style build

2013-04-27 12:59:47 +02:00

px4io.cpp

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

2013-06-12 12:24:52 +02:00

uploader.cpp

px4io: ensure upload device is closed after use

2013-05-04 19:18:11 +10:00

uploader.h

Moved position_estimator_mc, px4io driver and sdlog app to new style build

2013-04-27 12:59:47 +02:00