[paparazzi-commits] [paparazzi/paparazzi] 6a65b7: Merge branch 'master' into dev

[noreply]

Branch: refs/heads/new-state-interface
Home:   https://github.com/paparazzi/paparazzi

Commit: 6a65b7d1d3e216fbd328895d74930be41fccd81f
    
https://github.com/paparazzi/paparazzi/commit/6a65b7d1d3e216fbd328895d74930be41fccd81f
Author: Felix Ruess <address@hidden>
Date:   2011-05-18 (Wed, 18 May 2011)

Changed paths:
  A conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/autopilot/subsystems/fixedwing/i2c.makefile
  M conf/joystick/cockpit_sx.xml
  M conf/settings/tuning_ctl_new.xml
  A data/pictures/gcs_icons/eject.png
  A data/pictures/gcs_icons/home_emergency.png
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c

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


Commit: 24fa6e08df2b48690d8dd9b894397d1d8ab17bae
    
https://github.com/paparazzi/paparazzi/commit/24fa6e08df2b48690d8dd9b894397d1d8ab17bae
Author: Felix Ruess <address@hidden>
Date:   2011-05-18 (Wed, 18 May 2011)

Log Message:
-----------
Merge branch 'dev' into new-state-interface


Compare: https://github.com/paparazzi/paparazzi/compare/fdf4623...24fa6e0