Merge remote-tracking branch 'upstream/master' into new_state_machine

This commit is contained in:
Julian Oes
2013-02-18 13:55:43 -08:00
205 changed files with 6320 additions and 9477 deletions
-3
View File
@@ -1510,9 +1510,6 @@ int commander_thread_main(int argc, char *argv[])
} else {
current_status.flag_external_manual_override_ok = true;
}
} else {
warnx("ARMED, rejecting sys type change\n");
}
}