Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 0 insertions, 81 deletions

diff --git a/altoslib/AltosTelemetryRecordRaw.java b/altoslib/AltosTelemetryRecordRaw.java
deleted file mode 100644
index f94789bb..00000000
--- a/altoslib/AltosTelemetryRecordRaw.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright © 2011 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_1;
-
-public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
-	int[]	bytes;
-	int	serial;
-	int	tick;
-	int	type;
-	int	rssi;
-
-	long	received_time;
-
-	public int int8(int off) {
-		return AltosLib.int8(bytes, off + 1);
-	}
-
-	public int uint8(int off) {
-		return AltosLib.uint8(bytes, off + 1);
-	}
-
-	public int int16(int off) {
-		return AltosLib.int16(bytes, off + 1);
-	}
-
-	public int uint16(int off) {
-		return AltosLib.uint16(bytes, off + 1);
-	}
-
-	public int uint32(int off) {
-		return AltosLib.uint32(bytes, off + 1);
-	}
-
-	public int int32(int off) {
-		return AltosLib.int32(bytes, off + 1);
-	}
-
-	public String string(int off, int l) {
-		return AltosLib.string(bytes, off + 1, l);
-	}
-
-	public AltosTelemetryRecordRaw(int[] in_bytes, int in_rssi) {
-		bytes = in_bytes;
-		serial = uint16(0);
-		tick   = uint16(2);
-		type   = uint8(4);
-		rssi   = in_rssi;
-	}
-
-	public AltosRecord update_state(AltosRecord previous) {
-		AltosRecord	next;
-
-		if (previous != null && previous.serial == serial)
-			next = previous.clone();
-		else
-			next = new AltosRecordNone();
-		next.serial = serial;
-		next.tick = tick;
-		next.rssi = rssi;
-		return next;
-	}
-
-	public long received_time() {
-		return received_time;
-	}
-}