1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
LibrePilot/shared
James Cotton 5f7a9b513a Merge branch 'sambas/dsmx_stuff' of ssh://git.openpilot.org/OpenPilot into next
Conflicts:
	shared/uavobjectdefinition/hwsettings.xml
2011-08-24 11:37:30 -05:00
..
uavobjectdefinition Merge branch 'sambas/dsmx_stuff' of ssh://git.openpilot.org/OpenPilot into next 2011-08-24 11:37:30 -05:00