1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Philippe Renon 5bc17d7b87 Merge remote-tracking branch 'origin/thread/OP-1071_Map_Emergency_Line' into next
Conflicts:
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp
2015-01-31 15:35:07 +01:00
..