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
..
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-08-22 09:10:25 +10:00
2011-08-21 23:40:11 +10:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-05-25 16:15:01 +01:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2012-09-01 16:18:03 -05:00
2012-08-08 20:58:13 +02:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2012-04-03 03:42:34 -05:00
2012-04-03 03:42:34 -05:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-08-03 10:02:51 +02:00
2011-08-03 10:02:51 +02:00
2011-08-15 14:12:54 +01:00
2011-08-15 14:12:54 +01:00
2011-08-03 10:02:51 +02:00
2011-08-03 10:02:51 +02:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-05-29 14:02:10 +02:00
2011-05-09 15:19:10 +02:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-05-25 16:15:01 +01:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2012-02-22 23:03:17 +02:00
2012-02-22 23:03:17 +02:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-08-04 15:17:08 +02:00
2011-08-21 21:36:41 +10:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2012-07-31 00:18:10 +02:00
2011-01-23 18:03:59 +00:00
2011-05-31 23:31:40 -07:00
2011-05-29 14:02:10 +02:00