rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Code Issues Releases Activity
4bf2db57ad
LibrePilot/flight/Revolution
History
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
..
System sdcard: build fixes for revo due to sdcard removal 2012-08-20 21:32:19 -04:00
Makefile Merge remote-tracking branch 'op-public/next' into revo-next 2012-10-20 13:56:18 -04:00
Makefile.osx Merge remote-tracking branch 'op-public/next' into revo-next 2012-09-16 09:56:35 -04:00
UAVObjects.inc Merge remote-tracking branch 'op-public/next' into revo-next 2012-09-16 09:56:35 -04:00