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
..
openpilotgcs	Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization	2014-01-15 20:12:08 +01:00
uavobject-synthetics	Normalize line endings	2013-04-07 09:49:13 +03:00
uavobjgenerator	uncrustification	2013-12-07 15:25:15 +01:00
.gitattributes	OP-910: fix line endings and whitespaces (didn't work on Linux)	2013-06-05 23:21:54 +03:00
ground.pro	OP-1103 Fix for build error on OSX 10.8 after Qt5.1.1 update	2013-11-04 00:13:14 +11:00