Corvus Corax b6b03b767a Merge branch 'next' into corvuscorax/OP-1161_magnetometer-alarm ...

Conflicts:
	shared/uavobjectdefinition/revosettings.xml
	shared/uavobjectdefinition/systemalarms.xml

2014-05-01 10:26:53 +02:00

..

uavobjectdefinition

Merge branch 'next' into corvuscorax/OP-1161_magnetometer-alarm

2014-05-01 10:26:53 +02:00

.gitattributes

Normalize line endings

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