projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altoslib
/
AltosRecord.java
diff --git
a/altoslib/AltosRecord.java
b/altoslib/AltosRecord.java
index 8722bc050bac011f183248301012d27b1d46e5c0..8bab1d0cad2ad0c7b2700f809fc8ac09d14a6eff 100644
(file)
--- a/
altoslib/AltosRecord.java
+++ b/
altoslib/AltosRecord.java
@@
-17,11
+17,6
@@
package org.altusmetrum.AltosLib;
package org.altusmetrum.AltosLib;
-import java.lang.*;
-import java.text.*;
-import java.util.HashMap;
-import java.io.*;
-
public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
public static final int seen_flight = 1;
public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
public static final int seen_flight = 1;
@@
-173,7
+168,7
@@
public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
speed = old.speed;
height = old.height;
gps = new AltosGPS(old.gps);
speed = old.speed;
height = old.height;
gps = new AltosGPS(old.gps);
- new_gps =
false
;
+ new_gps =
old.new_gps
;
companion = old.companion;
}
companion = old.companion;
}