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

Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowser.ui
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h

2012-07-24 21:53:58 +01:00

..

openpilotgcs

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

2012-07-24 21:53:58 +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 branch 'next' into thread/OP-642

2012-07-01 12:25:23 +02:00

ground.pro

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

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