Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

Conflicts:
	ao-tools/altosui/AltosFlightUI.java

1 files changed, 8 insertions, 5 deletions

diff --git a/ao-tools/altosui/AltosDebug.java b/ao-tools/altosui/AltosDebug.java
index 3f469d48..9aa35d3f 100644
--- a/ao-tools/altosui/AltosDebug.java
+++ b/ao-tools/altosui/AltosDebug.java
@@ -19,11 +19,10 @@ package altosui;
 
 import java.lang.*;
 import java.io.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.LinkedList;
-import java.util.Iterator;
-import altosui.AltosSerial;
-import altosui.AltosRomconfig;
+import java.util.concurrent.*;
+import java.util.*;
+
+import libaltosJNI.*;
 
 public class AltosDebug extends AltosSerial {
 
@@ -261,4 +260,8 @@ public class AltosDebug extends AltosSerial {
 	public void reset() {
 		printf ("R\n");
 	}
+
+	public AltosDebug (altos_device in_device) throws FileNotFoundException, AltosSerialInUseException {
+		super(in_device);
+	}
 }
\ No newline at end of file