PT_Dreamer 8bb94e052b Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release ... Conflicts: ground/openpilotgcs/src/plugins/config/camerastabilization.ui ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.h ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp		2012-08-21 17:05:36 +01:00
..
docs	GCS-Added UAVO to widget framework documentation	2012-07-27 12:14:26 +01:00
openpilotgcs	Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release	2012-08-21 17:05:36 +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