Merge branch 'master' into P25

This commit is contained in:
Jonathan Naylor 2016-09-27 19:47:07 +01:00
commit 25cfff3ada
26 changed files with 43736 additions and 42672 deletions

View file

@ -43,6 +43,7 @@ public:
void clock(unsigned int ms);
private:
unsigned char* m_callsign;
CYSFNetwork* m_network;
CDisplay* m_display;
bool m_duplex;