diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-06-17 10:02:00 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-06-17 10:02:00 -0600 |
| commit | 085336c45ce0577031a7af5de117a8b856160708 (patch) | |
| tree | 13a145eab69e38f2658359fa8395e7257b3c3fb9 /telegps/TeleGPSConfigUI.java | |
| parent | 50c9a54ac6b04458970eedfa6d3e0e25f41c765f (diff) | |
| parent | 639e461ded29a48c155afea12171cbfc191ccfd7 (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'telegps/TeleGPSConfigUI.java')
| -rw-r--r-- | telegps/TeleGPSConfigUI.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java index 0f8a3d25..fcba6195 100644 --- a/telegps/TeleGPSConfigUI.java +++ b/telegps/TeleGPSConfigUI.java @@ -22,8 +22,8 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; -import org.altusmetrum.altoslib_10.*; -import org.altusmetrum.altosuilib_10.*; +import org.altusmetrum.altoslib_11.*; +import org.altusmetrum.altosuilib_11.*; public class TeleGPSConfigUI extends AltosUIDialog @@ -854,7 +854,7 @@ public class TeleGPSConfigUI } String get_tracker_motion_label() { - return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units()); + return String.format("Logging Trigger Motion (%s):", AltosConvert.height.parse_units()); } void set_tracker_tool_tip() { |