From f2a0bd56a37d814d56376765498aea84ffc3c4cb Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Fri, 4 Sep 2015 22:58:49 +0200
Subject: [PATCH] [conf] update settings_modules in conf example and tests

---
 conf/conf_example.xml | 2 +-
 conf/conf_tests.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/conf_example.xml b/conf/conf_example.xml
index 1b163bbe44d..c536d38de94 100644
--- a/conf/conf_example.xml
+++ b/conf/conf_example.xml
@@ -227,7 +227,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_float_mlkf.xml settings/control/stabilization_att_int_quat.xml"
-   settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_rtp_stream.xml"
+   settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/video_rtp_stream.xml"
    gui_color="red"
   />
   <aircraft
diff --git a/conf/conf_tests.xml b/conf/conf_tests.xml
index 9bde5216001..2581a55f16f 100644
--- a/conf/conf_tests.xml
+++ b/conf/conf_tests.xml
@@ -337,8 +337,8 @@
    telemetry="telemetry/fixedwing_flight_recorder.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml"
-   settings_modules=""
    gui_color="blue"
+   settings_modules=""
   />
   <aircraft
    name="ardrone2"
@@ -370,7 +370,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_float_mlkf.xml settings/control/stabilization_att_int_quat.xml"
-   settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_rtp_stream.xml"
+   settings_modules="modules/geo_mag.xml modules/air_data.xml modules/video_thread.xml modules/video_rtp_stream.xml"
    gui_color="red"
   />
   <aircraft