Merge branch 'master' into AX25

This commit is contained in:
Jonathan Naylor 2020-06-17 15:48:20 +01:00
commit b3398710bc
27 changed files with 1721 additions and 243 deletions

View file

@ -69,7 +69,7 @@ private:
CDMRNetwork* m_dmrNetwork;
CYSFNetwork* m_ysfNetwork;
CP25Network* m_p25Network;
CNXDNNetwork* m_nxdnNetwork;
INXDNNetwork* m_nxdnNetwork;
CPOCSAGNetwork* m_pocsagNetwork;
CAX25Network* m_ax25Network;
CDisplay* m_display;