1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
LibrePilot/ground
James Cotton c242ab8b86 Merge branch 'next' into revolution3
Conflicts:
	flight/AHRS/ahrs.c
	flight/AHRS/pios_board.c
	flight/Bootloaders/Revolution/Makefile
	flight/CopterControl/System/pios_board.c
	flight/INS/pios_board.c
	flight/OpenPilot/Makefile
	flight/OpenPilot/System/openpilot.c
	flight/OpenPilot/System/pios_board.c
	flight/PiOS/Boards/STM32103CB_CC_Rev1.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/Makefile
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/test.c
2012-01-24 10:46:35 -06:00
..
openpilotgcs Merge branch 'next' into revolution3 2012-01-24 10:46:35 -06:00
uavobjects Fix 64-Bit Linux build problem in QT-Creator 2011-04-03 16:25:21 +00:00
uavobjgenerator Merge branch 'next' into revolution3 2012-01-21 11:27:03 -06:00
ground.pro Change reference to svn by git (in comments, no code change) 2011-04-24 20:23:20 +03:00