rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity
54b429e8ce
LibrePilot/flight/PipXtreme/System
History
Stacey Sheldon c73cffce59 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	Makefile
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/System/inc/pios_config.h
	package/Makefile

Fixed CRLF line end clobbering in:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Common/pios_usb_util.c
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/PiOS/inc/pios_usb_util.h
2012-06-10 19:01:11 -04:00
..
inc Fixed failed merge with next. 2012-05-20 18:36:08 -07:00
alarms.c Re-baslined the PipX codebase using the experimental Transmitter codebase. 2012-02-21 20:29:06 -07:00
pios_board_posix.c Re-baslined the PipX codebase using the experimental Transmitter codebase. 2012-02-21 20:29:06 -07:00
pios_board.c Merge remote-tracking branch 'op-public/next' into revo-next 2012-06-10 19:01:11 -04:00
pios_usb_board_data.c Fixed failed merge with next. 2012-05-20 18:36:08 -07:00
pipxtreme.c Some cleanup on PipXtreme codebase. 2012-02-23 19:58:23 -07:00