Oleg Semyonov e62cc8914c Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next ...

Conflicts:
	flight/CopterControl/Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/hwsettings.xml

2012-02-22 23:03:17 +02:00

..

System

Added failsafe to GCS Receiver device.

2012-02-02 19:59:42 -07:00

Makefile

Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next

2012-02-22 23:03:17 +02:00