[paparazzi-commits] [paparazzi/paparazzi] bbd269: [baro] baro_board_module.c was missing, sorry

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/paparazzi/paparazzi
  Commit: bbd26925f24082217c9eef2b512bcc060a1fc37a
      
https://github.com/paparazzi/paparazzi/commit/bbd26925f24082217c9eef2b512bcc060a1fc37a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    A sw/airborne/modules/sensors/baro_board_module.c

  Log Message:
  -----------
  [baro] baro_board_module.c was missing, sorry


  Commit: 3f45b20c3c894d002e7d662deaf2d98a1797d850
      
https://github.com/paparazzi/paparazzi/commit/3f45b20c3c894d002e7d662deaf2d98a1797d850
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    M conf/airframes/examples/easystar_ets.xml
    R conf/gui.xml
    M conf/modules/baro_board.xml
    M sw/airborne/arch/sim/sim_gps.c
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/modules/sensors/airspeed_ets.c
    M sw/airborne/modules/sensors/airspeed_ets.h
    M sw/airborne/modules/sensors/baro_board_module.h
    M sw/airborne/modules/sensors/baro_ets.c
    M sw/airborne/modules/sensors/baro_ets.h
    M sw/airborne/subsystems/ins/ins_float.c
    M sw/airborne/subsystems/ins/ins_float.h
    M sw/airborne/subsystems/sensors/baro.h
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/gm.ml
    M sw/lib/ocaml/http.ml
    M sw/lib/ocaml/http.mli
    M sw/tools/Makefile
    M sw/tools/wiki_gen/Makefile

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master'

Conflicts:
        sw/airborne/modules/sensors/baro_board_module.c


  Commit: 91aaaedc90d4c2bd6d90c1b302f6efc4eaad6197
      
https://github.com/paparazzi/paparazzi/commit/91aaaedc90d4c2bd6d90c1b302f6efc4eaad6197
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    A conf/modules/baro_hca.xml
    A sw/airborne/modules/sensors/baro_hca.c
    A sw/airborne/modules/sensors/baro_hca.h

  Log Message:
  -----------
  [baro] add a new i2c baro sensor (HCA)


Compare: 
https://github.com/paparazzi/paparazzi/compare/2e77c82d01eb...91aaaedc90d4