Stefan Karlsson 454d491e48 Merge branch 'next' into skarlsso/OP-1397_add_responsiveness_to_txpid ...

Conflicts:
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.cpp
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.h

2014-08-10 10:06:44 +02:00

..

uavobjectdefinition

Merge branch 'next' into skarlsso/OP-1397_add_responsiveness_to_txpid

2014-08-10 10:06:44 +02:00

.gitattributes

Normalize line endings

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