Conflicts: include/hyperion/Hyperion.h libsrc/hyperion/Hyperion.cpp libsrc/jsonserver/JsonClientConnection.cpp Former-commit-id: 53467c63b97c7dc370f04357588f7cf1ad0e3ada |
||
---|---|---|
.. | ||
schema | ||
CMakeLists.txt | ||
JsonClientConnection.cpp | ||
JsonClientConnection.h | ||
JsonSchemas.qrc | ||
JsonServer.cpp |