1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/shared
Philippe Renon ff8a001a51 Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
Conflicts:
	ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
2014-01-12 16:29:17 +01:00
..
uavobjectdefinition Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization 2014-01-12 16:29:17 +01:00
.gitattributes Normalize line endings 2013-04-07 09:49:13 +03:00