James Cotton 3155324384 Merge branch 'next' into cc3d ... Conflicts: Makefile ground/openpilotgcs/src/plugins/config/configahrswidget.cpp shared/uavobjectdefinition/ahrscalibration.xml shared/uavobjectdefinition/ahrssettings.xml shared/uavobjectdefinition/attituderaw.xml		2012-05-03 16:31:49 -05:00
..
openpilotgcs	Merge branch 'next' into cc3d	2012-05-03 16:31:49 -05:00
uavobjects	Fix 64-Bit Linux build problem in QT-Creator	2011-04-03 16:25:21 +00:00
uavobjgenerator	Merge branch 'next' into cc3d	2012-05-03 16:31:49 -05:00
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00