[paparazzi-commits] [paparazzi/paparazzi] bf0a6b: fucking git salsa

[noreply]

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

Commit: bf0a6b2cd51d3c18b06dc6e545b2b324d30b9927
    
https://github.com/paparazzi/paparazzi/commit/bf0a6b2cd51d3c18b06dc6e545b2b324d30b9927
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/math/pprz_geodetic_double.c

Log Message:
-----------
fucking git salsa
Merge branch 'master' of github.com:paparazzi/paparazzi

Conflicts:
        sw/airborne/math/pprz_geodetic_double.c


Commit: 29e4f169ee05dc620e6c57bc1315b5a318dc127a
    
https://github.com/paparazzi/paparazzi/commit/29e4f169ee05dc620e6c57bc1315b5a318dc127a
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M .gitignore
  M TODO
  M conf/airframes/jsbsim.xml
  A conf/simulator/Malolo1/Malolo1-IC.xml
  M sw/airborne/gps_ubx.c
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/test/test_geodetic.c
  M sw/simulator/sim_ac_fw.c
  M sw/simulator/sim_ac_jsbsim.c

Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi

Conflicts:
        sw/airborne/math/pprz_geodetic_double.c


Commit: 4326f2a91c436a381736bea40ed4d3ced8a90414
    
https://github.com/paparazzi/paparazzi/commit/4326f2a91c436a381736bea40ed4d3ced8a90414
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/booz/test/booz2_test_radio_control.c

Log Message:
-----------
updated to use radio_control subsystem