Sambas
|
f7b9223827
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/modules/System/systemmod.c
shared/uavobjectdefinition/taskinfo.xml
|
2013-05-02 09:00:12 +03:00 |
|
Corvus Corax
|
e1233c7780
|
Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay
Conflicts:
flight/targets/Revolution/System/inc/openpilot.h
flight/targets/SimPosix/System/inc/openpilot.h
flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
flight/targets/boards/revolution/firmware/inc/openpilot.h
flight/targets/boards/revoproto/firmware/inc/openpilot.h
|
2013-04-27 13:26:03 +02:00 |
|
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 |
|
Oleg Semyonov
|
66db978244
|
Rename Libraries->libraries, Modules->modules
|
2013-04-25 13:13:36 +03:00 |
|