James Cotton 2f65fc1e8e Merge branch 'next' into relay_tuning ... Conflicts: shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-09-04 10:43:04 -05:00
..
openpilotgcs	Merge branch 'next' into relay_tuning	2012-09-04 10:43:04 -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