1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/flight/PiOS
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
..
Boards Merge branch 'revo-fixes' of ssh://git.openpilot.org/OpenPilot into brian/rfm22_autoconf 2012-12-30 07:59:09 -07:00
Common Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next 2013-01-31 13:40:32 +00:00
inc Merge branch 'revo-fixes' of ssh://git.openpilot.org/OpenPilot into brian/rfm22_autoconf 2012-12-30 07:59:09 -07:00
STM32F4xx Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next 2013-01-31 13:40:32 +00:00
STM32F10x Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next 2013-01-31 13:40:32 +00:00
pios.h Merge branch 'revo-fixes' of ssh://git.openpilot.org/OpenPilot into brian/rfm22_autoconf 2012-12-30 07:59:09 -07:00