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
..
inc	Fix win32 sim macro problem	2011-09-01 21:50:13 -04:00
win32	Merge branch 'next' into revo	2012-09-01 16:18:03 -05:00
pios.h	Fix win32 SiTL by adding PiOS CRC and another missing function.	2011-06-20 15:48:05 -04:00