1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
LibrePilot/flight/PiOS
Stacey Sheldon 127ca1e7e1 Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	ground/openpilotgcs/src/plugins/hitl/plugin.pro
	ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.h
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-20 13:56:18 -04:00
..
Boards Merge remote-tracking branch 'op-public/next' into revo-next 2012-10-20 13:56:18 -04:00
Common Merge remote-tracking branch 'op-public/next' into revo-next 2012-10-20 13:56:18 -04:00
inc Merge remote-tracking branch 'op-public/next' into revo-next 2012-10-20 13:56:18 -04:00
STM32F4xx Merge remote-tracking branch 'op-public/next' into revo-next 2012-10-20 13:56:18 -04:00
STM32F10x DSMx bindmode delay was too long, satellite binding works again. 2012-10-07 12:09:42 +11:00
pios.h Wave audio player test app. 2012-07-30 11:45:36 +03:00