abeck70 8c31f96dd7 Merge branch 'rel-15.02' RC4 into next ...

Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp

2015-03-07 16:47:46 +11:00

..

openpilotgcs

Merge branch 'rel-15.02' RC4 into next

2015-03-07 16:47:46 +11: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