PT_Dreamer c88c4f0fc0 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release ...

Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h

2012-09-14 14:12:16 +01:00

..

docs

GCS-Added UAVO to widget framework documentation

2012-07-27 12:14:26 +01:00

openpilotgcs

Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release

2012-09-14 14:12:16 +01: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