James Cotton 6350ec575e Merge remote-tracking branch 'origin/os/features/stick-deadband-next' into next ... Conflicts: ground/openpilotgcs/src/plugins/config/configinputwidget.cpp		2012-03-21 16:03:40 -05:00
..
openpilotgcs	Merge remote-tracking branch 'origin/os/features/stick-deadband-next' into next	2012-03-21 16:03:40 -05:00
uavobjects	Fix 64-Bit Linux build problem in QT-Creator	2011-04-03 16:25:21 +00:00
uavobjgenerator	Merge remote-tracking branch 'origin/pt/gcs_uavobj_widget_framework' into next	2012-02-14 14:24:23 -06:00
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00