Corvus Corax 022f1a1ac0 Merge branch 'next' into corvuscorax/OP-947_stateestimator-module ...

Conflicts:
	flight/modules/Attitude/revolution/attitude.c

2013-06-09 13:49:52 +02:00

..

Actuator

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

Airspeed/revolution

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

Altitude

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

AltitudeHold

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

Attitude

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-09 13:49:52 +02:00

Autotune

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

Battery

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

CallbackTest

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

CameraStab

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

ComUsbBridge

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

Example

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

Extensions/MagBaro

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

Fault

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

FirmwareIAP

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

FixedWingPathFollower

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

FlightPlan

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

GPS

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-09 13:49:52 +02:00

ManualControl

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

MK/MKSerial

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

OPLink

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

Osd

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

OveroSync

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

PathPlanner

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

RadioComBridge

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

Sensors

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

Stabilization

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00

StateEstimation

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-09 13:49:52 +02:00

System

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

Telemetry

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

TxPID

OP-976: Add the ';' back

2013-06-03 20:37:40 -07:00

VtolPathFollower

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-06 19:25:54 +02:00