diff options
| author | Anthony Towns <aj@erisian.com.au> | 2010-11-18 05:54:06 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2010-11-18 05:54:06 +1000 |
| commit | 939be6793238a275b7682ecc376fed14379cf044 (patch) | |
| tree | f05feaf2572cccd5eb1e8565b70fc6948f607194 /ao-tools/altosui/AltosDeviceDialog.java | |
| parent | e68fe9454352087889c560d95797922493117acb (diff) | |
| parent | 1a4b6e96f823035b113f01d1bdfd61afc1f33e25 (diff) | |
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
Conflicts:
ao-tools/altosui/AltosFlightUI.java
Diffstat (limited to 'ao-tools/altosui/AltosDeviceDialog.java')
| -rw-r--r-- | ao-tools/altosui/AltosDeviceDialog.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java index ec78e288..2966ad1e 100644 --- a/ao-tools/altosui/AltosDeviceDialog.java +++ b/ao-tools/altosui/AltosDeviceDialog.java @@ -26,7 +26,6 @@ import libaltosJNI.libaltos; import libaltosJNI.altos_device; import libaltosJNI.SWIGTYPE_p_altos_file; import libaltosJNI.SWIGTYPE_p_altos_list; -import altosui.AltosDevice; public class AltosDeviceDialog extends JDialog implements ActionListener { |