m_thread 423191eae1 Merge remote-tracking branch 'origin/next' into thread/OP-1685_cc_oneshot_support ...

Conflicts:
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/output.ui

2015-02-22 23:59:01 +01:00

..

openpilotgcs

Merge remote-tracking branch 'origin/next' into thread/OP-1685_cc_oneshot_support

2015-02-22 23:59:01 +01:00

uavobject-synthetics

Normalize line endings

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

uavobjgenerator

OP-1538 Changed the way splitter state is changed.

2014-10-14 09:51:02 +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

git merge next

2013-12-18 20:14:26 +01:00