g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-20 13:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into nxdn

Browse source
This commit is contained in:
Jonathan Naylor 2018-02-08 20:50:18 +00:00
commit 635a774c83
26 changed files with 266 additions and 755 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Conf.h
View file

@ -167,7 +167,6 @@ 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;
@ -361,7 +360,6 @@ 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;