Philippe Renon 37dab0e4fc Merge remote-tracking branch 'origin/next' into filnet/telemetry ... Conflicts: ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp ground/openpilotgcs/src/plugins/coreplugin/telemetrymonitorwidget.cpp ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp		2013-12-02 22:54:00 +01:00
..
openpilotgcs	Merge remote-tracking branch 'origin/next' into filnet/telemetry	2013-12-02 22:54:00 +01:00
share.pro	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00