[paparazzi-commits] [paparazzi/paparazzi] 32661f: Merge branch 'master' into dev

[noreply]

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

Commit: 32661f972cf6fa082e4f6a500ce47f8955231f08
    
https://github.com/paparazzi/paparazzi/commit/32661f972cf6fa082e4f6a500ce47f8955231f08
Author: Felix Ruess <address@hidden>
Date:   2011-04-01 (Fri, 01 Apr 2011)

Changed paths:
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/settings/settings_test.xml
  M sw/airborne/boards/lisa_m/baro_board.c
  M sw/airborne/boards/lisa_m/baro_board.h
  A sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/subsystems/settings.c
  M sw/airborne/subsystems/settings.h
  M sw/tools/gen_settings.ml

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

resolved conflicts:
        sw/airborne/subsystems/navigation/spiral.c


Commit: 721ff7484cf5397401eb2a6cabd3814287337980
    
https://github.com/paparazzi/paparazzi/commit/721ff7484cf5397401eb2a6cabd3814287337980
Author: Felix Ruess <address@hidden>
Date:   2011-04-01 (Fri, 01 Apr 2011)

Changed paths:
  A conf/airframes/AirborneCodeReorg/ChimuLisaFw.xml
  M conf/airframes/TU_Delft/yapa_xsens.xml
  A conf/modules/ins_chimu.xml
  A conf/radios/R617FS_5ch_neg.xml
  A sw/airborne/modules/ins/endian_functions.c
  A sw/airborne/modules/ins/endian_functions.h
  A sw/airborne/modules/ins/imu_chimu.c
  A sw/airborne/modules/ins/imu_chimu.h

Log Message:
-----------
Merge remote branch 'paparazzi/CHIMU' into dev


Commit: 9ab9ccb7606082f19ea28b2f6a229dba025dbb74
    
https://github.com/paparazzi/paparazzi/commit/9ab9ccb7606082f19ea28b2f6a229dba025dbb74
Author: Felix Ruess <address@hidden>
Date:   2011-04-01 (Fri, 01 Apr 2011)

Changed paths:
  M sw/airborne/modules/ins/endian_functions.c
  M sw/airborne/modules/ins/endian_functions.h
  M sw/airborne/modules/ins/imu_chimu.c
  M sw/airborne/modules/ins/imu_chimu.h

Log Message:
-----------
fix line endings


Compare: https://github.com/paparazzi/paparazzi/compare/03bb0e6...9ab9ccb