Feat: SSDP discovery for hyperion-remote (#602)

* Auto stash before merge of "log" and "hyperion-project/master"

* resolve merge tool mess
This commit is contained in:
brindosch
2019-08-17 09:44:57 +02:00
committed by GitHub
parent c4d0edd9c2
commit d3f45e7ae5
17 changed files with 104 additions and 87 deletions

View File

@@ -7,7 +7,8 @@ class QUdpSocket;
enum searchType{
STY_WEBSERVER,
STY_FLATBUFSERVER
STY_FLATBUFSERVER,
STY_JSONSERVER
};
///