Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Shawn Chain 2018-07-04 19:58:25 +08:00
commit 69f811012c

View file

@ -171,7 +171,7 @@ m_dmrNetworkLocal(0U),
m_dmrNetworkPassword(),
m_dmrNetworkOptions(),
m_dmrNetworkDebug(false),
m_dmrNetworkJitter(300U),
m_dmrNetworkJitter(360U),
m_dmrNetworkSlot1(true),
m_dmrNetworkSlot2(true),
m_dmrNetworkModeHang(3U),