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 for OP-661: error messages in GCS log due to obsolete AHRSComms and SDCard related alarms. Change also disables obsolete SDCard support on the flight side of CC and PipX	2012-07-31 11:07:07 +09:30
alarms.c	Re-baslined the PipX codebase using the experimental Transmitter codebase.	2012-02-21 20:29:06 -07:00
pios_board_posix.c	Re-baslined the PipX codebase using the experimental Transmitter codebase.	2012-02-21 20:29:06 -07:00
pios_board.c	Merge branch 'next' into revo	2012-09-01 16:18:03 -05:00
pios_usb_board_data.c	Fixed failed merge with next.	2012-05-20 18:36:08 -07:00
pipxtreme.c	Some cleanup on PipXtreme codebase.	2012-02-23 19:58:23 -07:00