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

..

Boards

rcvr: support multiple simultaneous receivers

2011-08-02 01:22:04 -04:00

Common

Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG

2011-08-27 15:26:05 -05:00

inc

Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG

2011-08-27 15:26:05 -05:00

STM32F10x

Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG

2011-08-27 15:26:05 -05:00

pios.h

rcvr: add generic driver API for receivers

2011-07-05 22:02:47 -04:00