Merge branch 'navigator_new' into navigator_new_vector

This commit is contained in:
Anton Babushkin
2013-12-31 19:31:16 +04:00
3 changed files with 70 additions and 89 deletions
@@ -65,9 +65,7 @@ typedef enum {
NAV_STATE_NONE = 0,
NAV_STATE_LOITER,
NAV_STATE_MISSION,
NAV_STATE_MISSION_LOITER,
NAV_STATE_RTL,
NAV_STATE_RTL_LOITER,
NAV_STATE_MAX
} nav_state_t;