Alessio Morale 1c3fb70ab1 OP-629 Block arming on all navigation based modes ... Conflicts: flight/modules/ManualControl/manualcontrol.c		2013-05-03 22:32:23 +02:00
..
Actuator	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
Airspeed/revolution	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
Altitude	Merge remote-tracking branch 'origin/next' into sambas/diffnext	2013-04-26 16:31:19 +03:00
AltitudeHold	OP-938 Stop AH from running when board is not armed	2013-05-03 22:32:23 +02:00
Attitude	Cherry-pick and hand-merge of Sami's math cleanup commit from branch sambas/diffnext: 5f3e0c3e1d	2013-04-28 10:45:28 +09:30
Autotune	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
Battery	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
CallbackTest	Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay	2013-04-27 13:26:03 +02:00
CameraStab	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
ComUsbBridge	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
Example	Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay	2013-04-27 13:26:03 +02:00
Extensions/MagBaro	Merge remote-tracking branch 'origin/next' into sambas/diffnext	2013-04-26 16:31:19 +03:00
Fault	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
FirmwareIAP	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
FixedWingPathFollower	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
FlightPlan	Rename template files to *.template to screen from uncrustify processing	2013-04-30 16:54:27 +02:00
GPS	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
ManualControl	OP-629 Block arming on all navigation based modes	2013-05-03 22:32:23 +02:00
MK/MKSerial	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
OPLink	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
Osd	Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext	2013-05-02 09:00:12 +03:00
OveroSync	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
PathPlanner	Cherry-pick and hand-merge of Sami's math cleanup commit from branch sambas/diffnext: 5f3e0c3e1d	2013-04-28 10:45:28 +09:30
RadioComBridge	OP-932: Fixes configuration of the remote serial connection when using VCP/raw comms.	2013-05-03 14:46:14 +01:00
Sensors	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
Stabilization	Merge remote-tracking branch 'origin/next' into sambas/diffnext	2013-04-26 16:31:19 +03:00
System	Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext	2013-05-02 09:00:12 +03:00
Telemetry	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
TxPID	Rename Libraries->libraries, Modules->modules	2013-04-25 13:13:36 +03:00
VtolPathFollower	Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext	2013-04-28 09:46:14 +03:00