abeck70 57e0a8baf5 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1721 ...

Conflicts:
	flight/modules/Sensors/sensors.c

2015-02-23 14:40:55 +11:00

..

libraries

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1721

2015-02-23 14:40:55 +11:00

modules

Merge remote-tracking branch 'origin/amorale/OP-1658_sensor_overhaul_next' into next

2015-02-22 16:28:04 +01:00

pios

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1721

2015-02-23 14:40:55 +11:00

Project

Signed cats

2014-11-21 11:53:47 +11:00

targets

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1721

2015-02-23 14:40:55 +11:00

templates

OP-1477 - remove debug infos and add send some relevant informations using SYS message (firmware and board revision/info)

2014-09-24 01:06:41 +02:00

tests

Merge remote-tracking branch 'origin/amorale/OP-1379_ext_led_notification_module_new' into next

2014-09-29 21:26:31 +02:00

uavobjects

OP-1658 - Add PIOS_SENSORS and Sensor framework API

2015-02-03 00:00:05 +01:00

uavtalk

OP-943 uses pios_mem API for heap allocation

2014-06-11 22:15:40 +02:00

.gitattributes

Update flight/.gitattributes to include *.template files

2013-04-30 22:15:58 +02:00