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

c2344689

Commit c2344689 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'bug/visionfreeze' into 'master'

Bug/visionfreeze

Closes #28

See merge request nicolas.pope/ftl!10

parents b8ffe0aa 6088eac1

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/vision/src/streamer.cpp 6 additions, 2 deletions

applications/vision/src/streamer.cpp
components/net/cpp/include/ftl/net/peer.hpp 0 additions, 16 deletions

components/net/cpp/include/ftl/net/peer.hpp
components/net/cpp/include/ftl/net/universe.hpp 1 addition, 0 deletions

components/net/cpp/include/ftl/net/universe.hpp
components/net/cpp/include/ftl/uuid.hpp 6 additions, 3 deletions

components/net/cpp/include/ftl/uuid.hpp
components/net/cpp/src/peer.cpp 3 additions, 1 deletion

components/net/cpp/src/peer.cpp
components/net/cpp/src/universe.cpp 40 additions, 32 deletions

components/net/cpp/src/universe.cpp
components/net/cpp/test/net_integration.cpp 19 additions, 1 deletion

components/net/cpp/test/net_integration.cpp

with 75 additions and 55 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