Merge branch 'master' into branch-1.8

1 files changed, 26 insertions, 0 deletions

diff --git a/altoslib/AltosUsbId.java b/altoslib/AltosUsbId.java
new file mode 100644
index 00000000..e3794304
--- /dev/null
+++ b/altoslib/AltosUsbId.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2018 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, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ */
+
+package org.altusmetrum.altoslib_12;
+
+public class AltosUsbId {
+	public int	vid;
+	public int	pid;
+
+
+	public AltosUsbId(int vid, int pid) {
+		this.vid = vid;
+		this.pid = pid;
+	}
+}