diff options
author | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
commit | 3cf030fffffd223c3717011e03aac82346295d71 (patch) | |
tree | b6da4fbb1180b75bedb86ce608503a6c0aeb47f3 /altoslib/AltosTelemetryFile.java | |
parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
src/Makefile
Diffstat (limited to 'altoslib/AltosTelemetryFile.java')
-rw-r--r-- | altoslib/AltosTelemetryFile.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java index 09d7d3f8..3d3fa407 100644 --- a/altoslib/AltosTelemetryFile.java +++ b/altoslib/AltosTelemetryFile.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_3; +package org.altusmetrum.altoslib_4; import java.io.*; import java.util.*; @@ -62,7 +62,7 @@ public class AltosTelemetryFile extends AltosStateIterable { } public void write(PrintStream out) { - + } public AltosTelemetryFile(FileInputStream input) { |