Merge branch 'master' into XLXs

This commit is contained in:
Jonathan Naylor
2017-09-16 17:30:46 +01:00

View File

@@ -61,8 +61,8 @@ m_dmrNetwork1Port(0U),
m_dmrNetwork1Local(0U), m_dmrNetwork1Local(0U),
m_dmrNetwork1Password(), m_dmrNetwork1Password(),
m_dmrNetwork1Options(), m_dmrNetwork1Options(),
m_dmrNetwork1Debug(false),
m_dmrNetwork1Location(true), m_dmrNetwork1Location(true),
m_dmrNetwork1Debug(false),
m_dmrNetwork1TGRewrites(), m_dmrNetwork1TGRewrites(),
m_dmrNetwork1PCRewrites(), m_dmrNetwork1PCRewrites(),
m_dmrNetwork1TypeRewrites(), m_dmrNetwork1TypeRewrites(),