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
..
bin	OP-719: fix +x for openpilotgcs on linux	2013-04-14 14:09:46 +03:00
share	Merge remote-tracking branch 'origin/next' into filnet/telemetry	2013-12-02 22:54:00 +01:00
src	Merge remote-tracking branch 'origin/next' into filnet/telemetry	2013-12-02 22:54:00 +01:00
copydata.pro	OP-1132 added new openssl-install that downloads and install the required SSL libraries for Windows	2013-12-01 23:17:48 +01:00
openpilotgcs.pri	[OP-835] Qt 5.1.0 - fixed ((packed)) pragma issue introduced by MinGW upgrade	2013-09-15 23:39:48 +02:00
openpilotgcs.pro	OP-1103 Some minor cleanup work and adding a version check for Qt5.1	2013-11-13 21:04:57 +11:00