1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/flight
Oleg Semyonov e2fd821e97 Merge remote-tracking branch 'origin/next' into sambas/diffnext
Conflicts:
	make/common-defs.mk
2013-04-26 16:31:19 +03:00
..
libraries Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-26 16:31:19 +03:00
modules Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-26 16:31:19 +03:00
Modules/Osd/osdoutput Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-26 16:31:19 +03:00
pios Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-26 16:31:19 +03:00
PiOS/inc Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-26 16:31:19 +03:00
Project Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-25 17:26:49 +03:00
targets Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-26 16:31:19 +03:00
tests/logfs Rename PiOS/Common->PiOS/common 2013-04-25 13:13:39 +03:00
uavobjects Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-25 17:26:49 +03:00
uavtalk OP-899: move UAVObjects and UAVTalk one level up from targets 2013-04-24 00:07:07 +03:00
.gitattributes Normalize line endings 2013-04-07 09:49:13 +03:00