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 /micropeak/MicroDataPoint.java | |
| parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
	src/Makefile
Diffstat (limited to 'micropeak/MicroDataPoint.java')
| -rw-r--r-- | micropeak/MicroDataPoint.java | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/micropeak/MicroDataPoint.java b/micropeak/MicroDataPoint.java index 61faf794..5a5e8c37 100644 --- a/micropeak/MicroDataPoint.java +++ b/micropeak/MicroDataPoint.java @@ -17,7 +17,7 @@  package org.altusmetrum.micropeak; -import org.altusmetrum.altosuilib_1.*; +import org.altusmetrum.altosuilib_2.*;  public class MicroDataPoint implements AltosUIDataPoint {  	public double		time;  | 
