[paparazzi-commits] [paparazzi/paparazzi] 4bb7e7: Merging changes from the dev branch.

[GitHub]

  Branch: refs/heads/dev
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 4bb7e7c2465651080c0d5ead227ea0a111f691f1
      
https://github.com/paparazzi/paparazzi/commit/4bb7e7c2465651080c0d5ead227ea0a111f691f1
  Author: Bernard Davison <address@hidden>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/stabilization_int_quat.makefile
  M 
conf/autopilot/subsystems/rotorcraft/stabilization_int_quat_transition.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_l_1.1.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/lisa_m_2.0.makefile
  M conf/boards/navgo_1.0.makefile
  M conf/boards/tiny_0.99.makefile
  M conf/boards/tiny_1.1.makefile
  M conf/boards/tiny_2.1.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/boards/twog_1.0.makefile
  R conf/boards/twog_1.makefile
  M conf/boards/umarim_1.0.makefile
  M conf/mtk.dtd
  M sw/airborne/firmwares/rotorcraft/actuators.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_skiron.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_skiron.h
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/actuators/supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/supervision.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
  M sw/airborne/firmwares/rotorcraft/stabilization.c
  M sw/airborne/firmwares/rotorcraft/stabilization.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.h
  M sw/airborne/modules/benchmark/flight_benchmark.h
  M sw/simulator/flightModel.ml

  Log Message:
  -----------
  Merging changes from the dev branch.