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
..
openpilotgcs	Merge remote-tracking branch 'origin/thread/OP-1071_Map_Emergency_Line' into next	2015-01-31 15:35:07 +01:00
uavobject-synthetics	Normalize line endings	2013-04-07 09:49:13 +03:00
uavobjgenerator	OP-1538 Changed the way splitter state is changed.	2014-10-14 09:51:02 +02:00
.gitattributes	OP-910: fix line endings and whitespaces (didn't work on Linux)	2013-06-05 23:21:54 +03:00
ground.pro	git merge next	2013-12-18 20:14:26 +01:00