Merge branch 'master' into nxdn

This commit is contained in:
Jonathan Naylor 2018-02-08 18:31:05 +00:00
commit 0e804b7390
2 changed files with 2 additions and 2 deletions

View file

@ -165,7 +165,7 @@ m_dmrNetworkLocal(0U),
m_dmrNetworkPassword(), m_dmrNetworkPassword(),
m_dmrNetworkOptions(), m_dmrNetworkOptions(),
m_dmrNetworkDebug(false), m_dmrNetworkDebug(false),
m_dmrNetworkJitterEnabled(true), m_dmrNetworkJitterEnabled(false),
m_dmrNetworkJitter(300U), m_dmrNetworkJitter(300U),
m_dmrNetworkSlot1(true), m_dmrNetworkSlot1(true),
m_dmrNetworkSlot2(true), m_dmrNetworkSlot2(true),

View file

@ -131,7 +131,7 @@ Debug=0
Enable=1 Enable=1
Address=44.131.4.1 Address=44.131.4.1
Port=62031 Port=62031
JitterEnabled=1 JitterEnabled=0
Jitter=500 Jitter=500
# Local=62032 # Local=62032
Password=PASSWORD Password=PASSWORD