Merge branch 'branch-1.6' into debian

Conflicts:
	ChangeLog
	altoslib/AltosTelemetryReader.java
	configure.ac

1 files changed, 30 insertions, 0 deletions

diff --git a/altoslib/AltosSavedState.java b/altoslib/AltosSavedState.java
new file mode 100644
index 00000000..552e4533
--- /dev/null
+++ b/altoslib/AltosSavedState.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2014 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.
+ */
+
+package org.altusmetrum.altoslib_6;
+
+import java.io.*;
+
+public class AltosSavedState implements Serializable {
+	public AltosState		state;
+	public AltosListenerState	listener_state;
+
+	public AltosSavedState(AltosState state, AltosListenerState listener_state) {
+		this.state = state;
+		this.listener_state = listener_state;
+	}
+}