1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
LibrePilot/shared/uavobjectdefinition
Stacey Sheldon 9a5ba841cf Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypointactive.xml
2012-09-15 19:55:47 -04:00
..
2012-03-27 10:06:27 -05:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00
2012-05-05 09:40:44 -07:00