m_thread 63ad5e69da Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into thread/OP-1107_About_dialog_enhancements ...

Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp
	ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro
	ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
	ground/openpilotgcs/src/plugins/coreplugin/qml/ScrollDecorator.qml
	ground/openpilotgcs/src/plugins/coreplugin/qml/TabWidget.qml

2013-11-14 20:09:05 +01:00

..

bin

OP-719: fix +x for openpilotgcs on linux

2013-04-14 14:09:46 +03:00

share

OP-1109: port plugins/pfdqml

2013-11-14 00:48:00 +01:00

src

Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into thread/OP-1107_About_dialog_enhancements

2013-11-14 20:09:05 +01:00

copydata.pro

[OP-835] Qt 5.1.0 - adapt copydata.pro to Qt 5.1.0 (Windows only)

2013-09-15 23:24:49 +02: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