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

[noreply]

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

  Commit: f5531a4a8eb46844965e614966e1296e1cf70eae
      
https://github.com/paparazzi/paparazzi/commit/f5531a4a8eb46844965e614966e1296e1cf70eae
  Author: Felix Ruess <address@hidden>
  Date:   2011-09-03 (Sat, 03 Sep 2011)

  Changed paths:
    M conf/airframes/CDW/ChimuTinyFw.xml
  M conf/airframes/ENAC/fixed-wing/funjet2.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_new.xml
  M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/ENAC/fixed-wing/weasel.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/NoVa_L.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/yapa_xsens.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/example_twog_analogimu.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/airframes/test_hb.xml
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_dcm.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared_i2c.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/control.makefile
  M conf/autopilot/subsystems/fixedwing/control_adaptive.makefile
  M conf/autopilot/subsystems/fixedwing/control_new.makefile
  M conf/autopilot/subsystems/fixedwing/current_sensor.makefile
  M conf/autopilot/subsystems/fixedwing/gps_mediatek_diy.makefile
  M conf/autopilot/subsystems/fixedwing/gps_nmea.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_hitl.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_utm.makefile
  M conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
  M conf/autopilot/subsystems/fixedwing/gyro_pitch.makefile
  M conf/autopilot/subsystems/fixedwing/gyro_roll.makefile
  M conf/autopilot/subsystems/fixedwing/i2c.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/imu_aspirin_i2c.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  M conf/autopilot/subsystems/fixedwing/imu_ppzuav.makefile
  M conf/autopilot/subsystems/fixedwing/joystick.makefile
  M conf/autopilot/subsystems/fixedwing/navigation.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M conf/autopilot/subsystems/fixedwing/spi.makefile
  M conf/autopilot/subsystems/fixedwing/spi_slave_hs.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_ic.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_l_1.1.makefile
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.h

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