diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-28 17:22:24 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-28 17:22:24 +0200 |
| commit | f0a21c4f5f9a840eda797fbe162220fa98f77a37 (patch) | |
| tree | 4361bd1b19c5a65dd91c29046e9676bf8fd67529 /src/lib/geo/geo.h | |
| parent | 196edd8a4faa36f837ff440ed41fc9656f96e20f (diff) | |
| parent | 045ee8c7c7c4618a8a03f9c9342f53d2fc7333c9 (diff) | |
| download | px4-firmware-f0a21c4f5f9a840eda797fbe162220fa98f77a37.tar.gz px4-firmware-f0a21c4f5f9a840eda797fbe162220fa98f77a37.tar.bz2 px4-firmware-f0a21c4f5f9a840eda797fbe162220fa98f77a37.zip | |
Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator
Conflicts:
src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
Diffstat (limited to 'src/lib/geo/geo.h')
| -rw-r--r-- | src/lib/geo/geo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/geo/geo.h b/src/lib/geo/geo.h index 87c1cf460..8b286af36 100644 --- a/src/lib/geo/geo.h +++ b/src/lib/geo/geo.h @@ -50,7 +50,7 @@ __BEGIN_DECLS -#include "geo_mag_declination.h" +#include "geo_lookup/geo_mag_declination.h" #include <stdbool.h> |