Fredrik Larson b59857e3e7 Merge branch 'next' into fw_wiz ...

Conflicts:
	ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp

2014-09-03 02:48:34 +10:00

..

openpilotgcs

Merge branch 'next' into fw_wiz

2014-09-03 02:48:34 +10:00

uavobject-synthetics

Normalize line endings

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

uavobjgenerator

OP-1456 get rid of cast_struct_to_array because it is error prone!

2014-08-24 00:16:34 +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