Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-02-11 11:18:45 +01:00
32 changed files with 217 additions and 174 deletions

View File

@@ -164,6 +164,7 @@ struct timer_remotebox_item
std::string pass;
std::string rbname;
std::string rbaddress;
bool online;
};
struct SNeutrinoSettings