Merge branch 'master' into nxdn

This commit is contained in:
Jonathan Naylor
2018-01-16 20:14:57 +00:00
5 changed files with 57 additions and 29 deletions

View File

@@ -63,7 +63,6 @@ private:
unsigned int m_p25NetModeHang;
unsigned int m_nxdnNetModeHang;
CTimer m_modeTimer;
CTimer m_dmrBeaconTimer;
CTimer m_dmrTXTimer;
CTimer m_cwIdTimer;
bool m_duplex;