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
..
2012-05-01 11:11:31 -05:00
2012-05-03 16:31:49 -05:00
2012-05-01 11:11:31 -05:00
2011-08-08 08:36:40 -05:00
2012-04-01 22:39:27 -04:00
2012-01-21 11:27:03 -06:00
2012-05-03 16:31:49 -05:00
2012-01-22 19:41:41 -05:00
2012-05-03 16:31:49 -05:00
2012-01-22 23:23:41 -05:00
2011-09-01 21:50:13 -04:00
2012-03-03 08:43:01 -05:00
2012-03-27 00:53:27 -04:00
2012-04-03 03:41:52 -05:00
2012-05-03 16:31:49 -05:00
2011-12-30 23:05:36 -05:00
2009-12-22 05:07:27 +00:00