Merge branch 'master' into nxdn

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

View File

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