Merge branch 'master' into nxdn

This commit is contained in:
Jonathan Naylor
2018-02-08 20:50:18 +00:00
26 changed files with 266 additions and 755 deletions

View File

@@ -58,10 +58,4 @@ enum RPT_NET_STATE {
RS_NET_DATA
};
enum B_STATUS {
BS_NO_DATA,
BS_DATA,
BS_MISSING
};
#endif