Merge remote-tracking branch 'origin/master' into input-overhaul

This commit is contained in:
rdb 2018-01-28 14:44:54 +01:00
commit fb32b96456

View File

@ -296,6 +296,8 @@ def GetHost():
osname = subprocess.check_output(["uname", "-o"])
if osname.strip().lower() == b'android':
return 'android'
else:
return 'linux'
except:
return 'linux'
elif sys.platform.startswith('freebsd'):