James Cotton 386a9d41ef Merge branch 'next' into test2 ...

Conflicts:
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m

2012-09-10 14:29:26 -05:00

..

openpilotgcs

Merge branch 'next' into test2

2012-09-10 14:29:26 -05:00

uavobjects

GCS - Strangely QtCreator builds stopped working for me after compiling Wireshark on Ubuntu.

2012-07-09 14:52:41 +01:00

uavobjgenerator

Merge remote-tracking branch 'origin/kenz/matlab_parser_vectorizing' into next

2012-09-02 19:23:18 -05:00

ground.pro

Change reference to svn by git (in comments, no code change)

2011-04-24 20:23:20 +03:00