[paparazzi-commits] [paparazzi/paparazzi] efbe70: Merge branch 'dev'

[noreply]

  Branch: refs/heads/dev
  Home:   https://github.com/paparazzi/paparazzi

  Commit: efbe7038e7504d4a55c664742e7b4190489cd7be
      
https://github.com/paparazzi/paparazzi/commit/efbe7038e7504d4a55c664742e7b4190489cd7be
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-20 (Thu, 20 Oct 2011)

  Changed paths:
    M .gitignore
  M conf/Makefile.lpc21
  R conf/airframes/Poine/autoplato.xml
  R conf/airframes/Poine/booz2_a2.xml
  R conf/airframes/Poine/booz2_a3.xml
  R conf/airframes/Poine/booz2_a4.xml
  R conf/airframes/Poine/booz2_a5.xml
  R conf/airframes/Poine/fuckyou.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/flixr_discovery.xml
  A conf/airframes/obsolete/autoplato.xml
  A conf/airframes/obsolete/booz2_a2.xml
  A conf/airframes/obsolete/booz2_a3.xml
  A conf/airframes/obsolete/booz2_a4.xml
  A conf/airframes/obsolete/booz2_a5.xml
  A conf/autopilot/subsystems/fixedwing/settings_rc.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/conf.xml.example
  A conf/settings/tuning_ins_rc.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_tacho.c
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h
  M sw/airborne/test/ahrs/Makefile
  M sw/ground_segment/cockpit/Makefile
  M sw/ground_segment/joystick/Makefile
  M sw/ground_segment/tmtc/GSM/Makefile
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml
  R sw/ground_segment/visu3d/Makefile
  R sw/ground_segment/visu3d/TODO
  R sw/ground_segment/visu3d/mapGL.ml
  M sw/in_progress/button/Makefile
  M sw/in_progress/fdm/Makefile
  M sw/in_progress/ir_calibration/Makefile
  M sw/in_progress/motor_bench/Makefile
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/ivy/Makefile
  M sw/logalizer/Makefile
  M sw/logalizer/sliding_plot.c
  M sw/simulator/old_booz/tests/Makefile
  R sw/supervision/paparazzi.pl

  Log Message:
  -----------
  Merge branch 'dev'