Philippe Renon 17c9c8d8b0 Merge remote-tracking branch 'origin/next' into filnet/telemetry ... Conflicts: ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro		2013-12-07 16:39:19 +01:00
..
openpilotgcs	Merge remote-tracking branch 'origin/next' into filnet/telemetry	2013-12-07 16:39:19 +01:00
share.pro	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00