Cliff Geerdes d9ab9e4f27 Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features ...

Conflicts:
	flight/modules/GPS/GPS.c

2015-05-05 17:05:11 -04:00

..

libraries

OP-1867 autoland/takeoff

2015-05-04 21:48:24 +10:00

modules

Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features

2015-05-05 17:05:11 -04:00

pios

OP-1837 Uncrustify

2015-04-26 21:08:54 +02:00

Project

Signed cats

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

targets

Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next

2015-05-02 16:34:15 +02: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-1740 UAV0 GetSet Functions Take Enum: getting codebase to compile - multiple changes needed, still incomplete (i.e. this commit will not compile, but I want to save my changes on more than just my machine :-)

2015-04-08 21:40:15 -05:00

uavtalk

OP-1841 - Check available size at each step to avoid overrun

2015-04-20 05:48:39 +02:00

.gitattributes

Update flight/.gitattributes to include *.template files

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