[paparazzi-commits] [paparazzi/paparazzi] de2004: [settings] fix multiple settings in modules

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/paparazzi/paparazzi
  Commit: de200404abec6a0f869b804be92c35da2f318fd5
      
https://github.com/paparazzi/paparazzi/commit/de200404abec6a0f869b804be92c35da2f318fd5
  Author: Gautier Hattenberger <address@hidden>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M sw/lib/ocaml/env.ml
    M sw/lib/ocaml/env.mli
    M sw/lib/ocaml/gen_common.ml
    M sw/lib/ocaml/gen_common.mli
    M sw/supervision/pc_aircraft.ml
    M sw/tools/generators/gen_aircraft.ml
    M sw/tools/generators/gen_settings.ml

  Log Message:
  -----------
  [settings] fix multiple settings in modules

close #901


  Commit: e670d2b70c16d8cfb1cd2eb6479e0757fd1abaa0
      
https://github.com/paparazzi/paparazzi/commit/e670d2b70c16d8cfb1cd2eb6479e0757fd1abaa0
  Author: Gautier Hattenberger <address@hidden>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M conf/Makefile.ardrone2
    M conf/Makefile.geode
    M conf/Makefile.lpc21
    M conf/Makefile.pentium-m
    M sw/airborne/arch/lpc21/test/Makefile

  Log Message:
  -----------
  [build] remove 'load' target from makefile

It is a special command in Make 4.0


Compare: 
https://github.com/paparazzi/paparazzi/compare/7fe80015714e...e670d2b70c16