Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android_branch' into relay_via_http

Browse source
This commit is contained in:
Eric House 2017-12-15 07:20:53 -08:00
commit da1c3f992a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
View file

@ -172,6 +172,7 @@ public class RelayService extends XWService
{
boolean enabled = ! XWPrefs
.getPrefsBoolean( context, R.string.key_disable_relay, false );
// Log.d( TAG, "relayEnabled() => %b", enabled );
return enabled;
}

2
xwords4/linux/scripts/discon_ok2.sh
View file

@ -44,7 +44,7 @@ declare -A LOGS
declare -A MINEND
declare -A ROOM_PIDS
declare -a APPS_OLD=()
declare -a DICTS= # wants to be =() too?
declare -a DICTS=() # wants to be =() too?
declare -A CHECKED_ROOMS
function cleanup() {