Fredrik Arvidsson 81efc2a931 Merge branch 'next' into thread/OP-39 ...

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

2012-09-22 10:58:55 +02:00

..

openpilotgcs

Remove old versions from source, however, they are still in the Artwork

2012-09-22 10:47:10 +10:00

share.pro

Merge branch 'next' into thread/OP-39

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