Merge branch 'master' into nxdn

This commit is contained in:
Jonathan Naylor
2018-01-15 21:12:56 +00:00
8 changed files with 90 additions and 19 deletions

4
Conf.h
View File

@@ -104,7 +104,7 @@ public:
// The DMR section
bool getDMREnabled() const;
bool getDMRBeacons() const;
unsigned int getDMRBeacons() const;
unsigned int getDMRId() const;
unsigned int getDMRColorCode() const;
bool getDMREmbeddedLCOnly() const;
@@ -297,7 +297,7 @@ private:
unsigned int m_dstarModeHang;
bool m_dmrEnabled;
bool m_dmrBeacons;
unsigned int m_dmrBeacons;
unsigned int m_dmrId;
unsigned int m_dmrColorCode;
bool m_dmrSelfOnly;