1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/flight/pios
Corvus Corax 6163c5f53a Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
Conflicts:
	flight/modules/AltitudeHold/altitudehold.c
	ground/openpilotgcs/share/openpilotgcs/pfd/default/AltitudeScale.qml
	ground/openpilotgcs/share/openpilotgcs/pfd/default/PfdIndicators.qml
	ground/openpilotgcs/share/openpilotgcs/pfd/default/SpeedScale.qml
	ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp
2013-06-22 18:44:03 +02:00
..
common Uncrustify 2013-06-18 20:23:46 +02:00
inc Merge branch 'next' into corvuscorax/OP-947_stateestimator-module 2013-06-22 18:44:03 +02:00
osx OP-976: Fix uncrustify changes that put a space before the ";" in the macro 2013-06-05 19:46:55 -07:00
posix Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +03:00
stm32f4xx Fix bootloader usb issues caused by USB reconnection fixes. 2013-06-17 20:24:07 +02:00
stm32f10x Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +03:00
win32 OP-976: Fix uncrustify changes that put a space before the ";" in the macro 2013-06-05 19:46:55 -07:00
pios_sim_posix.h Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +03:00
pios.h Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +03:00