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

uavobject-synthetics

Normalize line endings

2013-04-07 09:49:13 +03:00

uavobjgenerator

Merge remote-tracking branch 'origin/filnet/qt5.1.0' into next

2013-10-17 22:00:54 +02: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