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/AltosPreferences.java | |
parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
src/Makefile
Diffstat (limited to 'altoslib/AltosPreferences.java')
-rw-r--r-- | altoslib/AltosPreferences.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java index b8920d26..d299f27b 100644 --- a/altoslib/AltosPreferences.java +++ b/altoslib/AltosPreferences.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.*; @@ -55,7 +55,7 @@ public class AltosPreferences { /* Launcher channel preference name */ public final static String launcherChannelPreference = "LAUNCHER-CHANNEL"; - + /* Default logdir is ~/TeleMetrum */ public final static String logdirName = "TeleMetrum"; @@ -349,7 +349,7 @@ public class AltosPreferences { return launcher_channel; } } - + public static AltosPreferencesBackend bt_devices() { synchronized (backend) { return backend.node("bt_devices"); |