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

..

openpilotgcs

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

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

uavobject-synthetics

Normalize line endings

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

uavobjgenerator

GCS UAVO generator: generate properties for composed fields

2013-11-13 16:30:02 +01: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