Laura Sebesta c2b49b6ef3 Merge branch 'kenz/cc_hitl_merge' into next ... Conflicts: ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui		2012-10-08 15:30:27 +02:00
..
docs	GCS-Added UAVO to widget framework documentation	2012-07-27 12:14:26 +01:00
openpilotgcs	Merge branch 'kenz/cc_hitl_merge' into next	2012-10-08 15:30:27 +02:00
uavobjects	GCS - Strangely QtCreator builds stopped working for me after compiling Wireshark on Ubuntu.	2012-07-09 14:52:41 +01:00
uavobjgenerator	Added a backwards-compatible way to specify UAVO field element names and options as lists of child elements of the field element. Added the ability to specify that a field is a clone of another field, just with a different name	2012-09-08 14:41:55 +09:30
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00