James Cotton 6bfb2a5e45 Merge branch 'next' into revo ... Conflicts: ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp ground/openpilotgcs/src/libs/utils/coordinateconversions.h ground/openpilotgcs/src/plugins/opmap/opmap.pro ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp shared/uavobjectdefinition/taskinfo.xml shared/uavobjectdefinition/waypoint.xml		2012-09-01 16:18:03 -05:00
..
Boards	SimPosix: Reenabled File IO for UAVObject saving	2012-05-22 18:32:52 +02:00
inc	actuator: factor out settings updates from main loop	2012-08-11 19:46:00 -04:00
posix	Merge branch 'next' into revo	2012-09-01 16:18:03 -05:00
pios.h	Created new "SimPosix" board and ported PiOS.posix to revolution API and more "standard like" configuration akin to other "boards"	2012-05-22 18:32:27 +02:00