James Cotton dc340596f5 Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG ... Conflicts: flight/CopterControl/Makefile flight/OpenPilot/System/pios_board.c flight/OpenPilot/UAVObjects.inc flight/PiOS/STM32F10x/pios_spektrum.c ground/openpilotgcs/src/plugins/config/config.pro ground/openpilotgcs/src/plugins/config/configgadget.qrc ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro shared/uavobjectdefinition/hwsettings.xml		2011-08-27 15:26:05 -05:00
..
openpilotgcs	Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG	2011-08-27 15:26:05 -05:00
uavobjects	Fix 64-Bit Linux build problem in QT-Creator	2011-04-03 16:25:21 +00:00
uavobjgenerator	Merge remote branch 'origin/next' into OP-536_CorvusCorax_ObjectOrientedFirmwareUAVTalk	2011-08-17 08:30:32 +02:00
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00