Fredrik Arvidsson 69621ba2f8 Merge branch 'next' into thread/OP-39 ...

Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp

2012-09-20 23:53:33 +02:00

..

openpilotgcs

Add Nuno's new models

2012-09-20 13:17:18 +10:00

share.pro

Merge branch 'next' into thread/OP-39

2012-09-16 15:14:47 +02:00