Merge branch 'next' into corvuscorax/OP-1483_leaky-integrals-and-post-filtering
commitca7a3e4333afabe7b365610e900cd72ef7434f51
authorCorvus Corax <corvuscorax@cybertrench.com>
Tue, 23 Sep 2014 11:54:33 +0000 (23 13:54 +0200)
committerCorvus Corax <corvuscorax@cybertrench.com>
Tue, 23 Sep 2014 11:54:33 +0000 (23 13:54 +0200)
tree843d66ea2220ad192ed41253548d3c208d2d62f1
parent41e062373d16b98418f02fc037303990fa7b33da
parentb621df59f222b262ed37f00a3ed967acda9f3e25
Merge branch 'next' into corvuscorax/OP-1483_leaky-integrals-and-post-filtering
flight/modules/StateEstimation/inc/stateestimation.h
flight/modules/StateEstimation/stateestimation.c