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

[GitHub]

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

  Changed paths:
    M conf/airframes/example_heli_lisam.xml
  M conf/autopilot/logger.makefile
  M conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
  M conf/autopilot/subsystems/fixedwing/spi_slave_hs.makefile
  M conf/modules/ins_chimu_spi.xml
  M conf/modules/ins_chimu_uart.xml
  R sw/airborne/modules/ins/ins_chimu.h
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h
  M sw/airborne/modules/nav/nav_catapult.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/gps/gps_mtk.h
  M sw/airborne/subsystems/gps/gps_nmea.h
  M sw/airborne/subsystems/gps/gps_sim.h
  M sw/airborne/subsystems/gps/gps_sim_nps.h
  M sw/airborne/subsystems/gps/gps_skytraq.c
  M sw/airborne/subsystems/gps/gps_skytraq.h
  M sw/airborne/subsystems/gps/gps_ubx.h

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