James Cotton af02eb6517 Merge branch 'sim' into testing ... Conflicts: ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro		2012-04-14 14:40:43 -05:00
..
uavobjectdefinition	Merge branch 'sim' into testing	2012-04-14 14:40:43 -05:00