Alessio Morale 5c76c0ee07 Merge remote-tracking branch 'origin/steve/OP-1289_two_telemetry_streams' into next ... Conflicts: flight/modules/Telemetry/telemetry.c		2015-04-18 19:10:13 +02:00
..
coptercontrol	OP-1743 - Raise manualcontrol stack	2015-02-24 22:03:18 +01:00
discoveryf4bare	OP-1696 PathFollower rewrite in C++ and Landing Squashed commit of the following:	2015-03-20 21:42:20 +11:00
gpsplatinum	OP-1658 - Fixes for other targets (OSD and GPS)	2015-02-03 00:00:06 +01:00
oplinkmini	Merge remote-tracking branch 'origin/amorale/OP-1683_syncupdate_oneshot' into next	2015-02-08 17:59:59 +01:00
osd	Merge remote-tracking branch 'origin/amorale/OP-1658_sensor_overhaul_next' into next	2015-02-22 16:28:04 +01:00
revolution	Merge remote-tracking branch 'origin/steve/OP-1289_two_telemetry_streams' into next	2015-04-18 19:10:13 +02:00
revoproto	OP-1696 PathFollower rewrite in C++ and Landing Squashed commit of the following:	2015-03-20 21:42:20 +11:00
simposix	OP-1696 PathFollower rewrite in C++ and Landing Squashed commit of the following:	2015-03-20 21:42:20 +11:00