diff options
| author | Julian Oes <julian@oes.ch> | 2014-05-26 20:19:11 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-05-26 20:19:11 +0200 |
| commit | 063caba36bd2fe26eb4bfa8e546e9551ccc05519 (patch) | |
| tree | d8ea5015111793800d945fbc33505088cf5fe12d /src/modules/navigator/mission.h | |
| parent | 68352cb923d366b66bb68c8d946c4960b6f7ff1a (diff) | |
| parent | 36495cdb62e21b30a5a1851ec802c9f6a40c1171 (diff) | |
| download | px4-firmware-063caba36bd2fe26eb4bfa8e546e9551ccc05519.tar.gz px4-firmware-063caba36bd2fe26eb4bfa8e546e9551ccc05519.tar.bz2 px4-firmware-063caba36bd2fe26eb4bfa8e546e9551ccc05519.zip | |
Merge branch 'master' into navigator_rewrite
Conflicts:
src/drivers/gps/gps.cpp
src/drivers/gps/mtk.cpp
src/modules/commander/commander.cpp
src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
src/modules/navigator/mission.cpp
src/modules/navigator/mission.h
src/modules/navigator/navigator_main.cpp
src/modules/navigator/navigator_state.h
src/modules/position_estimator_inav/position_estimator_inav_main.c
Diffstat (limited to 'src/modules/navigator/mission.h')
| -rw-r--r-- | src/modules/navigator/mission.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/navigator/mission.h b/src/modules/navigator/mission.h index 0fa2ff3fa..5e0e9702d 100644 --- a/src/modules/navigator/mission.h +++ b/src/modules/navigator/mission.h @@ -34,6 +34,8 @@ * @file navigator_mission.h * Helper class to access missions * @author Julian Oes <julian@oes.ch> + * + * @author Julian Oes <joes@student.ethz.ch> */ #ifndef NAVIGATOR_MISSION_H |