[paparazzi-commits] [paparazzi/paparazzi] 97ed6e: Merge branch 'master' into dev

[noreply]

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

  Commit: 97ed6ecd4405b592c9f523ef3325f25c1c49817b
      
https://github.com/paparazzi/paparazzi/commit/97ed6ecd4405b592c9f523ef3325f25c1c49817b
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M conf/telemetry/xbee868.xml
  A githelper.sh

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


  Commit: adf8753f02fb5540e59e1c87cc8b150d36454596
      
https://github.com/paparazzi/paparazzi/commit/adf8753f02fb5540e59e1c87cc8b150d36454596
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/autopilot.h

  Log Message:
  -----------
  fix when using only settings/basic_infrared.xml: include estimator.h in 
autopilot.h


  Commit: 7b37761da710636648e9ccb2aded477e6cfe84ec
      
https://github.com/paparazzi/paparazzi/commit/7b37761da710636648e9ccb2aded477e6cfe84ec
  Author: Felix Ruess <address@hidden>
  Date:   2011-10-18 (Tue, 18 Oct 2011)

  Changed paths:
    M conf/telemetry/xbee868.xml
  A githelper.sh
  M sw/airborne/firmwares/fixedwing/autopilot.h

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


Compare: https://github.com/paparazzi/paparazzi/compare/5a67b33...7b37761