[paparazzi-commits] [paparazzi/paparazzi] 331c47: Merged paparazzi master into paparazzi dev and res...

[noreply]

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

Commit: 331c474d51cc1469a7fc4562b18741a3d58e16ce
    
https://github.com/paparazzi/paparazzi/commit/331c474d51cc1469a7fc4562b18741a3d58e16ce
Author: Christophe De Wagter <address@hidden>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M conf/control_panel.xml.example
  M conf/flight_plans/versatile_carto_fixe_muret.xml
  M conf/joystick/cockpit_sx.xml
  M conf/messages.xml
  M conf/modules/cartography.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/ground_segment/joystick/input2ivy.ml

Log Message:
-----------
Merged paparazzi master into paparazzi dev and resolved conflicts