Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

f81eb0a7

Commit f81eb0a7 authored 4 years ago by Sebastian Hahta

Downloads
- Plain Diff

Merge branch 'feature/gui2' of gitlab.utu.fi:nicolas.pope/ftl into feature/gui2

parents 0d71ed53 f144b130

No related branches found

No related tags found

1 merge request!316Resolves #343 GUI and Frame Refactor

Pipeline #28601 failed 4 years ago

Stage: all

Changes 11
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui2/src/modules/camera.cpp 1 addition, 1 deletion

applications/gui2/src/modules/camera.cpp
applications/reconstruct2/src/main.cpp 1 addition, 0 deletions

applications/reconstruct2/src/main.cpp
components/common/cpp/src/configuration.cpp 1 addition, 1 deletion

components/common/cpp/src/configuration.cpp
components/control/cpp/src/master.cpp 12 additions, 0 deletions

components/control/cpp/src/master.cpp
components/net/cpp/include/ftl/net/universe.hpp 48 additions, 76 deletions

components/net/cpp/include/ftl/net/universe.hpp
components/net/cpp/src/peer.cpp 1 addition, 1 deletion

components/net/cpp/src/peer.cpp
components/streams/include/ftl/streams/feed.hpp 1 addition, 1 deletion

components/streams/include/ftl/streams/feed.hpp
components/streams/src/feed.cpp 23 additions, 40 deletions

components/streams/src/feed.cpp
components/streams/src/netstream.cpp 12 additions, 8 deletions

components/streams/src/netstream.cpp
components/streams/src/receiver.cpp 8 additions, 4 deletions

components/streams/src/receiver.cpp
web-service/server/src/index.js 3 additions, 1 deletion

web-service/server/src/index.js

with 111 additions and 133 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