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
..
System	Merge branch 'sambas/dsmx_stuff' of ssh://git.openpilot.org/OpenPilot into next	2011-08-24 11:37:30 -05:00
Makefile	UAVObject Init: Get rid of deprecated linker init code	2011-08-10 22:48:42 -05:00