James Cotton 5e01617cbd Merge branch 'next' into MikeL ... Conflicts: ground/openpilotgcs/src/plugins/config/airframe.ui ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp ground/openpilotgcs/src/plugins/config/configoutputwidget.h ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h		2012-06-06 11:58:06 -05:00
..
System	Merge branch 'next' into MikeL	2012-06-06 11:58:06 -05:00
Makefile	Disable overosync by default. It was triggering event system warnings due to	2012-03-21 00:29:09 -05:00
UAVObjects.inc	Kalman filter for altitude	2012-02-11 21:08:19 -06:00