[paparazzi-commits] [paparazzi/paparazzi] ff42a5: Merge branch 'dev' into locm3

[GitHub]

  Branch: refs/heads/locm3
  Home:   https://github.com/paparazzi/paparazzi
  Commit: ff42a5eb36fdf6fd5158c8189096e8eddf02f6f0
      
https://github.com/paparazzi/paparazzi/commit/ff42a5eb36fdf6fd5158c8189096e8eddf02f6f0
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M conf/airframes/CDW/LisaAspirin2.xml
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
  M sw/airborne/modules/nav/nav_catapult.c
  M sw/airborne/modules/nav/nav_catapult.h
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/gps/gps_nmea.c
  M sw/airborne/subsystems/gps/gps_skytraq.c
  M sw/airborne/subsystems/gps/gps_ubx.c
  M sw/airborne/subsystems/imu/imu_aspirin2.c
  M sw/airborne/subsystems/imu/imu_aspirin2.h

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