Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile

1 files changed, 23 insertions, 0 deletions

diff --git a/src/kernel/ao_state.c b/src/kernel/ao_state.c
new file mode 100644
index 00000000..ed197aa5
--- /dev/null
+++ b/src/kernel/ao_state.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2009 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ao.h"
+
+const char const * const ao_state_names[] = {
+	"startup", "idle", "pad", "boost", "fast",
+	"coast", "drogue", "main", "landed", "invalid"
+};