James Cotton 9f50391fc5 Merge branch 'next' into revolution_sensors ...

Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml

2011-12-13 20:50:10 -06:00

..

System

CC: rename ReceiverPort PPM+Servo (Servo) options to PPM+Outputs (Outputs)

2011-12-11 22:52:51 +02:00

Makefile

Merge branch 'next' into revolution

2011-11-14 10:11:53 -06:00