Corvus Corax 6fdf554d4a Merge branch 'next' into corvuscorax/OP-947_stateestimator-module ... Conflicts: flight/modules/Attitude/revolution/attitude.c ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp shared/uavobjectdefinition/attitudesettings.xml		2013-06-06 19:25:54 +02:00
..
inc	Merge remote-tracking branch 'origin/next' into sambas/diffnext	2013-04-26 16:31:19 +03:00
osdinput.c	Merge branch 'next' into corvuscorax/OP-947_stateestimator-module	2013-06-06 19:25:54 +02:00