1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/flight/PiOS
Stacey Sheldon 754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Revolution/Makefile.osx
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
2012-09-16 09:56:35 -04:00
..
Boards Merge remote-tracking branch 'op-public/next' into revo-next 2012-09-16 09:56:35 -04:00
Common Merge remote-tracking branch 'op-public/next' into revo-next 2012-08-20 21:22:02 -04:00
inc Merge remote-tracking branch 'op-public/next' into revo-next 2012-08-20 21:22:02 -04:00
STM32F4xx They will be added the needed banks instead of defaulting to the last bank. 2012-09-14 22:50:13 +02:00
STM32F10x pipx: ensure pipx BL image is padded to fill its bank 2012-09-05 22:17:04 -04:00
pios.h Wave audio player test app. 2012-07-30 11:45:36 +03:00