[paparazzi-commits] [paparazzi/paparazzi] c8bbac: Merge branch 'master' into adaptive_fw

[noreply]

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

Commit: c8bbac704c355419b47176b490f9faf47b4be156
    
https://github.com/paparazzi/paparazzi/commit/c8bbac704c355419b47176b490f9faf47b4be156
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/autopilot/fixedwing.makefile
  M conf/autopilot/rotorcraft.makefile
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.h
  M sw/airborne/boards/booz/baro_board.c
  M sw/airborne/boards/booz/baro_board.h
  M sw/airborne/boards/booz_1.0.h
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.h
  R sw/airborne/booz/arch/sim/booz2_analog_hw.c
  R sw/airborne/booz/arch/sim/booz2_analog_hw.h
  R sw/airborne/booz/arch/stm32/booz2_analog_hw.h
  R sw/airborne/booz/booz2_analog.c
  R sw/airborne/booz/booz2_analog.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/mcu.c
  A sw/airborne/mcu_periph/dac.h

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


Commit: 49a6a0e6b4a72607060c5e53b169fc1c0fda4455
    
https://github.com/paparazzi/paparazzi/commit/49a6a0e6b4a72607060c5e53b169fc1c0fda4455
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  A conf/airframes/Poine/test_settings.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/settings/settings.dtd
  A conf/settings/settings_test.xml
  A sw/airborne/subsystems/settings.c
  A sw/airborne/subsystems/settings.h
  A sw/airborne/test/subsystems/test_settings.c
  A sw/airborne/test/subsystems/test_settings.h

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


Compare: https://github.com/paparazzi/paparazzi/compare/b6094b4...49a6a0e