Philippe Renon 694747cd27 Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization ... Conflicts: ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp		2014-01-15 20:12:08 +01:00
..
uavobjectdefinition	Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization	2014-01-15 20:12:08 +01:00
.gitattributes	Normalize line endings	2013-04-07 09:49:13 +03:00