Merge branch 'master' into AX25

This commit is contained in:
Jonathan Naylor
2020-06-30 11:40:55 +01:00
13 changed files with 22 additions and 24 deletions

View File

@@ -107,7 +107,7 @@ private:
std::string m_cwCallsign;
bool m_lockFileEnabled;
std::string m_lockFileName;
#if defined(USE_GPS)
#if defined(USE_GPSD)
CGPSD* m_gpsd;
#endif
CRemoteControl* m_remoteControl;