Corvus Corax f7a2e31809 Merge branch 'next' into theothercliff/OP-1259_Cruise_Control_Tweaks ... Conflicts: flight/pios/stm32f10x/inc/usb_conf.h		2014-05-01 22:58:10 +02:00
..
uavobjectdefinition	Merge branch 'next' into theothercliff/OP-1259_Cruise_Control_Tweaks	2014-05-01 22:58:10 +02:00
.gitattributes	Normalize line endings	2013-04-07 09:49:13 +03:00