[paparazzi-commits] [paparazzi/paparazzi] c60c84: Merge remote branch 'paparazzi/master' into ir

[noreply]

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

Commit: c60c844affe9e5bade66310b78422bb8baf845e7
    
https://github.com/paparazzi/paparazzi/commit/c60c844affe9e5bade66310b78422bb8baf845e7
Author: Gautier Hattenberger <address@hidden>
Date:   2011-01-05 (Wed, 05 Jan 2011)

Changed paths:
  M Makefile.install
  M conf/airframes/ENAC/fixed-wing/drops.xml
  M conf/airframes/ENAC/fixed-wing/firestorm.xml
  M conf/airframes/ENAC/fixed-wing/funjet1.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/slayer2.xml
  M conf/airframes/ENAC/fixed-wing/soarzi.xml
  M conf/airframes/ENAC/fixed-wing/solarstorm.xml
  M conf/airframes/ENAC/fixed-wing/spocII.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml
  M conf/airframes/Paul/minimag1.xml
  M conf/airframes/Poine/antenna.xml
  M conf/airframes/Poine/autoplato.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/bl_mc.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/motor_bench.xml
  M conf/airframes/Poine/pt_ant.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/TU_Delft/Trip50B.xml
  M conf/airframes/TU_Delft/holiday50.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_s1.xml
  M conf/airframes/demo.xml
  M conf/airframes/demo_module.xml
  M conf/airframes/hitl_usb.xml
  M conf/airframes/logger_sd.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_raw_makefile.xml
  M conf/airframes/mm/extra/logger_sd_adc.xml
  M conf/airframes/mm/extra/press_t.xml
  M conf/airframes/mm/extra/quiet.xml
  M conf/airframes/mm/extra/rctx.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjeteth1.xml
  M conf/airframes/mm/fixed-wing/funjeteth2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi1.xml
  M conf/airframes/mm/fixed-wing/funjetfmi2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi1.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.xml
  M conf/airframes/mm/fixed-wing/funjetgfi5.xml
  M conf/airframes/mm/fixed-wing/funjetgfi6.xml
  M conf/airframes/mm/fixed-wing/funjetgfi7.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/fixed-wing/twinstarmm.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/glass_one1.xml
  M conf/airframes/mm/hangar/glass_one2.xml
  M conf/airframes/mm/hangar/glass_one3.xml
  M conf/airframes/mm/hangar/lila.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/obsolete/dc_mc.xml
  M conf/airframes/obsolete/easystar2.xml
  M conf/airframes/obsolete/example.xml
  M conf/airframes/obsolete/kalscott_easystar.xml
  M conf/airframes/obsolete/microjet5.xml
  M conf/airframes/obsolete/microjet5_tp_auto.xml
  M conf/airframes/obsolete/microjet6.xml
  M conf/airframes/obsolete/microjetI.xml
  M conf/airframes/obsolete/microjetII.xml
  M conf/airframes/obsolete/microjetIII.xml
  M conf/airframes/obsolete/minimag_fs.xml
  M conf/airframes/obsolete/nova.xml
  M conf/airframes/obsolete/slayer1.xml
  M conf/airframes/obsolete/slayer3.xml
  M conf/airframes/obsolete/slayerJH.xml
  M conf/airframes/obsolete/slicer1.xml
  M conf/airframes/obsolete/slicer2.xml
  M conf/airframes/obsolete/spirit.xml
  M conf/airframes/obsolete/spirit_proto.xml
  M conf/airframes/obsolete/storm1.xml
  M conf/airframes/obsolete/tiny2.xml
  M conf/airframes/obsolete/tl.xml
  M conf/airframes/obsolete/twinjet1.xml
  M conf/airframes/obsolete/twinstar6.xml
  M conf/airframes/obsolete/twisted.xml
  M conf/airframes/obsolete/tyto1.xml
  M conf/airframes/obsolete/xxx1.xml
  A conf/airframes/test_hb.xml
  M conf/airframes/test_i2c.xml
  M conf/airframes/tiny_hitl.xml
  M conf/airframes/vor.xml
  M conf/airframes/wind_tunnel.xml
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/csc.makefile
  M conf/autopilot/csc_ap.makefile
  M conf/autopilot/mercury.makefile
  M conf/autopilot/mercury_csc.makefile
  M conf/autopilot/obsolete/booz_test_progs.makefile
  M conf/autopilot/obsolete/lisa_test_progs.makefile
  A conf/autopilot/obsolete/testing.makefile
  M conf/autopilot/obsolete/tiny.makefile
  M conf/autopilot/obsolete/twin_mcu_avr.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/sitl.makefile
  M conf/autopilot/sitl_jsbsim.makefile
  R conf/autopilot/subsystems/fixedwing/testing.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.2.makefile
  M debian/changelog.lenny
  M debian/control.lenny
  M debian/paparazzi-bin.postinst
  M debian/rules
  M sw/airborne/arch/lpc21/uart_tunnel.c
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_crista.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_led.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_micromag.c
  M sw/airborne/booz/test/booz2_test_modem.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz2_test_rc.c
  M sw/airborne/booz/test/booz2_test_usb.c
  M sw/airborne/booz/test/booz2_tunnel.c
  M sw/airborne/booz/test/booz2_tunnel_bb.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  M sw/airborne/csc/csc_ap_main.c
  M sw/airborne/csc/csc_baro.c
  M sw/airborne/csc/csc_datalink.c
  M sw/airborne/csc/csc_protocol.c
  M sw/airborne/csc/csc_rc_spektrum.c
  M sw/airborne/csc/csc_xsens.c
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/csc/mercury_main.c
  M sw/airborne/csc/mercury_xsens.c
  M sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/firmwares/beth/main_beth.c
  M sw/airborne/firmwares/beth/main_coders.c
  M sw/airborne/firmwares/beth/rcv_telemetry.c
  M sw/airborne/firmwares/beth/uart_hw.c
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_tacho.c
  M sw/airborne/firmwares/tutorial/main_demo2.c
  M sw/airborne/firmwares/tutorial/main_demo3.c
  M sw/airborne/firmwares/tutorial/main_demo6.c
  M sw/airborne/firmwares/vor/lpc_vor_main.c
  M sw/airborne/firmwares/wind_tunnel/main.c
  M sw/airborne/firmwares/wind_tunnel/main_mb.c
  M sw/airborne/fms/lpc_test_spi.c
  M sw/airborne/led.h
  M sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
  M sw/airborne/lisa/stm_test_spi_link.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2001.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.c
  M sw/airborne/lisa/test/lisa_tunnel.c
  M sw/airborne/lisa/test/test_board.c
  M sw/airborne/lisa/test/test_bswap.c
  M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_mc.c
  M sw/airborne/lisa/test_periodic.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/lisa/tunnel_hw.c
  M sw/airborne/mcu.c
  M sw/airborne/modules/core/extra_pprz_dl.h
  M sw/airborne/obsolete/3dmg.c
  M sw/airborne/sd_card/main.c
  M sw/airborne/test/nova_test_imu.c
  M sw/airborne/test/test_telemetry.c

Log Message:
-----------
Merge remote branch 'paparazzi/master' into ir