[paparazzi-commits] [paparazzi/paparazzi] 6f94bc: [flight_plan] merge conflict

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 6f94bc99c794d3e658cd4bdc3885eb33956af2aa
      
https://github.com/paparazzi/paparazzi/commit/6f94bc99c794d3e658cd4bdc3885eb33956af2aa
  Author: Christophe De Wagter <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M conf/flight_plans/Tudelft/rotorcraft_survey_mission.xml

  Log Message:
  -----------
  [flight_plan] merge conflict


  Commit: b0dcc0f7bdd0158208dbaeb8ec7444c8ca448700
      
https://github.com/paparazzi/paparazzi/commit/b0dcc0f7bdd0158208dbaeb8ec7444c8ca448700
  Author: Christophe De Wagter <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M conf/airframes/TUDelft/conf.xml

  Log Message:
  -----------
  [conf] TUD


  Commit: a0f49a42510274f73eee1e81e65bf58365a72525
      
https://github.com/paparazzi/paparazzi/commit/a0f49a42510274f73eee1e81e65bf58365a72525
  Author: Christophe De Wagter <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M conf/flight_plans/rotorcraft_survey.xml

  Log Message:
  -----------
  [survey] no need for autoshoot


Compare: 
https://github.com/paparazzi/paparazzi/compare/4bfab9d05000...a0f49a425102