1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
LibrePilot/flight
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
..
Doc Merged latest origin/next. 2012-05-05 09:40:44 -07:00
Libraries Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity 2013-02-03 14:57:54 +01:00
Modules Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity 2013-02-03 14:57:54 +01:00
PiOS Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge 2013-01-19 20:23:48 +01:00
PiOS.osx OSX Simulation: Start populating the board and fw information 2012-10-07 13:53:19 -05:00
PiOS.posix Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity 2013-02-03 14:57:54 +01:00
PiOS.win32 Merge branch 'next' into revo 2012-09-01 16:18:03 -05:00
Project makefile: update to released openocd 0.6.1 2013-01-28 02:13:17 +02:00
targets Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity 2013-02-03 14:57:54 +01:00
README.txt Says all it needs to say for now. 2009-12-22 05:07:27 +00:00

Check the wiki