Brian Webb a4faa22c4b Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next ... Conflicts: ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp		2013-01-31 13:40:32 +00:00
..
inc	Merge remote-tracking branch 'op-public/next' into revo-next	2012-09-16 09:56:35 -04:00
manualcontrol.c	Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next	2013-01-31 13:40:32 +00:00