Alessio Morale
|
e06ab7f706
|
Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next
Conflicts:
Makefile
flight/PiOS.posix/inc/pios_com.h
flight/targets/RevoMini/UAVObjects.inc
flight/targets/Revolution/Makefile
|
2013-03-23 14:37:19 +01:00 |
|
Alessio Morale
|
5fdaccc1fa
|
sim_posix: unified inc files with the rest of PiOS .h, some dir moves/cleanup, fixed some compilation issues.
|
2013-03-03 09:50:20 +01:00 |
|
Corvus Corax
|
7642f44cad
|
Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity
Conflicts:
flight/Modules/FirmwareIAP/firmwareiap.c
flight/Modules/ManualControl/manualcontrol.c
flight/targets/SimPosix/Makefile
shared/uavobjectdefinition/systemalarms.xml
|
2013-02-03 14:57:54 +01:00 |
|
Stacey Sheldon
|
69a2691bc2
|
rename: move board-specific dirs into flight/targets
Conflicts:
flight/targets/Bootloaders/Revolution/Makefile
flight/targets/CopterControl/Makefile
|
2013-01-28 01:52:44 +02:00 |
|