[paparazzi-commits] [paparazzi/paparazzi] b44d3f: fixing unmerged previous commit

[noreply]

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

Commit: b44d3f7ab8458da6d79c9e92801bb48aed1dd057
    
https://github.com/paparazzi/paparazzi/commit/b44d3f7ab8458da6d79c9e92801bb48aed1dd057
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:
-----------
fixing unmerged previous commit


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

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

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

Conflicts:
        sw/airborne/math/pprz_geodetic_double.c


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

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

Log Message:
-----------
trying to restore the fucking file