1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
LibrePilot/make
sambas abe3742217 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
	flight/Libraries/CoordinateConversions.c
	flight/Libraries/paths.c
	flight/Modules/System/systemmod.c
	flight/PiOS/STM32F4xx/pios_sys.c
	flight/targets/boards/coptercontrol/pios_board.h
	flight/targets/boards/revolution/pios_board.h
	flight/targets/boards/revoproto/pios_board.h
2013-04-25 17:26:49 +03:00
..
scripts Normalize line endings for *.sh after .gitattributes update 2013-04-24 20:09:38 +02:00
templates uncrustify: add config comment for "don't indent this section" option 2013-04-24 12:52:36 +03:00
winx86 Normalize line endings for *.sh after .gitattributes update 2013-04-24 20:09:38 +02:00
.gitattributes tools: make uncrustify_install target, script and base config file 2013-04-22 21:35:25 +02:00
apps-defs.mk Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3 2013-04-24 00:37:39 +03:00
boot-defs.mk Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-25 17:26:49 +03:00
common-defs.mk Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-20 10:59:00 +03:00
firmware-defs.mk tools: make uncrustify_install target, script and base config file 2013-04-22 21:35:25 +02:00
tools.mk tools: yet another fix for md5 calculation 2013-04-24 16:42:47 +03:00
unittest.mk ut: change xml output directory to make Bamboo a bit happier 2013-03-03 14:33:04 +01:00