Merge branch 'master' into nxdn

This commit is contained in:
Jonathan Naylor 2018-02-01 06:59:46 +00:00
commit 3858cf4aec
6 changed files with 33 additions and 18 deletions

2
Conf.h
View file

@ -167,6 +167,7 @@ public:
std::string getDMRNetworkPassword() const;
std::string getDMRNetworkOptions() const;
bool getDMRNetworkDebug() const;
bool getDMRNetworkJitterEnabled() const;
unsigned int getDMRNetworkJitter() const;
bool getDMRNetworkSlot1() const;
bool getDMRNetworkSlot2() const;
@ -360,6 +361,7 @@ private:
std::string m_dmrNetworkPassword;
std::string m_dmrNetworkOptions;
bool m_dmrNetworkDebug;
bool m_dmrNetworkJitterEnabled;
unsigned int m_dmrNetworkJitter;
bool m_dmrNetworkSlot1;
bool m_dmrNetworkSlot2;