Merge branch 'feature/websocket' into develop (6c056dac) · Commits · DFN2 / ocs-manager · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

ocs-manager
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Repositories are limited in size now to 1GB. If your repository exceeds this size, it will be automatically deleted.

Admin message

If you'd like access to our CI/CD builders, please create an issue here.

6c056dac

Commit 6c056dac authored 7 years ago by akiraohgaki

Downloads
- Plain Diff

Merge branch 'feature/websocket' into develop

parents 30825ca4 bd5feb70

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/app.pri 4 additions, 1 deletion

app/app.pri
app/src/main.cpp 28 additions, 4 deletions

app/src/main.cpp
app/src/websockets/websocketserver.cpp 94 additions, 0 deletions

app/src/websockets/websocketserver.cpp
app/src/websockets/websocketserver.h 39 additions, 0 deletions

app/src/websockets/websocketserver.h

with 165 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment