Thomas Gubler 16b9f666e7 Merge remote-tracking branch 'upstream/master' into dev_ros ...

Conflicts:
	src/lib/mathlib/math/Matrix.hpp
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
	src/platforms/px4_includes.h

2015-01-05 10:02:07 +01:00

..

include

Enable SPI4 for FMUv2

2014-05-28 10:49:12 +02:00

nsh

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

2015-01-05 10:02:07 +01:00

scripts

Build NuttX optimized for size

2014-11-15 13:50:56 +01:00

src

Pull v2 pieces up to build with the merge

2013-07-07 17:53:55 -07:00