Philippe Renon 617924e64d Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization ...

Conflicts:
	flight/uavobjects/uavobjectmanager.c
	ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.cpp
	ground/openpilotgcs/src/plugins/uavtalk/uavtalk.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypoint.xml

2013-12-08 14:58:01 +01:00

..

uavobjectdefinition

Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization

2013-12-08 14:58:01 +01:00

.gitattributes

Normalize line endings

2013-04-07 09:49:13 +03:00