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

Conflicts:
	apps/controllib/fixedwing.cpp

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

..

Makefile

Move the PX4IO driver into the drivers folder.

2012-10-22 21:39:55 -07:00

px4io.cpp

Merge branch 'master' into new_state_machine

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

uploader.cpp

px4io: make uploader more reliable

2013-02-05 18:30:31 +01:00

uploader.h

Made dtors virtual, tested on IO and FMU

2013-03-09 21:07:29 +01:00