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

..

aerocore

NuttX configs / build options: Do not warn about sign compare, as there are a bunch of non-standard signedness assumptions

2014-12-26 17:38:11 +01:00

px4fmu-v1

Merge pull request #1529 from PX4/fdmax

2014-12-28 23:46:39 +01:00

px4fmu-v2

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

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

px4io-v1

NuttX configs / build options: Do not warn about sign compare, as there are a bunch of non-standard signedness assumptions

2014-12-26 17:38:11 +01:00

px4io-v2

NuttX configs / build options: Do not warn about sign compare, as there are a bunch of non-standard signedness assumptions

2014-12-26 17:38:11 +01:00