Merge branch 'feature/desktop' into develop (374e53cb) · 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.

374e53cb

Commit 374e53cb authored 7 years ago by akiraohgaki

Downloads
- Plain Diff

Merge branch 'feature/desktop' into develop

parents 908909cd a51c4fe9

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/configs/application.json 1 addition, 1 deletion

app/configs/application.json
app/src/main.cpp 2 additions, 0 deletions

app/src/main.cpp
deployment.pri 21 additions, 0 deletions

deployment.pri
desktop/desktop.pri 3 additions, 0 deletions

desktop/desktop.pri
desktop/desktop.qrc 5 additions, 0 deletions

desktop/desktop.qrc
desktop/ocs-manager.desktop 8 additions, 0 deletions

desktop/ocs-manager.desktop
desktop/ocs-manager.svg 59 additions, 0 deletions

desktop/ocs-manager.svg
ocs-manager.pro 2 additions, 0 deletions

ocs-manager.pro

with 101 additions and 1 deletion

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