Thomas Gubler dcdde8ea88 Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge
Conflicts:
	src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
2015-01-21 14:41:03 +01:00
..
2014-12-23 14:34:53 +01:00
2014-11-11 13:45:25 +01:00
2014-11-18 17:20:50 -08:00
2014-11-11 13:45:25 +01:00
2015-01-19 16:51:08 +01:00