1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/flight
Alessio Morale 1b823b7b92 Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next
Conflicts:
	flight/libraries/sanitycheck.c
	flight/modules/StateEstimation/filtermag.c
	flight/modules/System/systemmod.c
2014-06-26 20:31:27 +02:00
..
libraries Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next 2014-06-26 20:31:27 +02:00
modules Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next 2014-06-26 20:31:27 +02:00
pios Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next 2014-06-22 19:31:03 +02:00
Project New CDC driver revsion 2013-08-17 04:04:22 +10:00
targets Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next 2014-06-26 20:31:27 +02:00
templates OP-770: add/rename some version-info.py template variables 2013-05-25 23:02:29 +02:00
tests/logfs uncrustify 2014-06-22 20:34:04 +02:00
uavobjects OP-943 uses pios_mem API for heap allocation 2014-06-11 22:15:40 +02: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