m_thread bd90dcc9e9 Merge remote-tracking branch 'origin/next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI ... Conflicts: ground/openpilotgcs/src/plugins/flightlog/flightlogmanager.h		2014-03-09 10:47:18 +01:00
..
openpilotgcs	Merge remote-tracking branch 'origin/next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI	2014-03-09 10:47:18 +01:00
uavobject-synthetics	Normalize line endings	2013-04-07 09:49:13 +03:00
uavobjgenerator	OP-1212 Add "priority" attribute to uavojects that grant them higher priority when sent with telemetry	2014-02-04 21:03:42 +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	git merge next	2013-12-18 20:14:26 +01:00