sambas 01df38008f Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext ...

Conflicts:
	flight/Libraries/sanitycheck.c
	flight/Modules/System/systemmod.c

2013-04-20 21:25:22 +03:00

..

board_hw_defs

Merge remote-tracking branch 'origin/sambas/diffnext' into amorale/osd_settings_on_flash

2013-04-14 12:32:26 +03:00

Bootloaders

typo fix, fix EE_BANK usage

2013-04-14 13:08:09 +03:00

BootloaderUpdater

Normalize line endings

2013-04-07 09:49:13 +03:00

CopterControl

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-04-20 21:25:22 +03:00

EntireFlash

OP-719: make python_install (Windows)

2013-04-12 10:56:10 +02:00

OSD

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-04-20 21:25:22 +03:00

PipXtreme

Merge remote-tracking branch 'origin/next' into amorale/OP-886_sanitychecks

2013-04-19 23:43:42 +02:00

Revolution

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-04-20 21:25:22 +03:00

RevoMini

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-04-20 21:25:22 +03:00

SimPosix

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-04-20 21:25:22 +03:00

UAVObjects

flashsettings and WDG for osd, revert the uavobjectmanager revert.

2013-04-14 12:43:37 +03:00

UAVTalk

Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next

2013-03-23 14:37:19 +01:00