Merge branch 'master' into nxdn

2018-02-08 18:31:05 +00:00 · 2018-02-08 18:31:05 +00:00 · 0e804b7390
parent e82a6d8bb7 f8c85a8043
commit 0e804b7390
2 changed files with 2 additions and 2 deletions
--- a/Conf.cpp
+++ b/Conf.cpp
@ -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),
--- a/MMDVM.ini
+++ b/MMDVM.ini
@ -131,7 +131,7 @@ Debug=0
 Enable=1
 Address=44.131.4.1
 Port=62031
-JitterEnabled=1
+JitterEnabled=0
 Jitter=500
 # Local=62032
 Password=PASSWORD