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
..
inc	OP-193: Weak leveling variant on rate mode. Slowly will return to level.	2011-07-04 20:44:55 -05:00
manualcontrol.c	Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG	2011-08-27 15:26:05 -05:00