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

Admin message

!! The university Gitlab servers will be under database migration and maintenance on 6.5. from 08:00 onwards. !!

!! There will be some sporadic server outages of undetermined duration during the day and we suggest you avoid any larger projects or CI/CD runs during this period. !!

!! There will be an announcement here when the maintenance is done. !!

6b97a40d

Commit 6b97a40d 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 bdd8f80c 087ed62a

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui2/src/modules/camera.cpp 17 additions, 0 deletions

applications/gui2/src/modules/camera.cpp
applications/gui2/src/modules/camera.hpp 2 additions, 0 deletions

applications/gui2/src/modules/camera.hpp
applications/gui2/src/views/camera.cpp 37 additions, 0 deletions

applications/gui2/src/views/camera.cpp
applications/gui2/src/views/camera.hpp 1 addition, 0 deletions

applications/gui2/src/views/camera.hpp
applications/gui2/src/views/camera3d.cpp 1 addition, 2 deletions

applications/gui2/src/views/camera3d.cpp
components/streams/src/feed.cpp 16 additions, 10 deletions

components/streams/src/feed.cpp

with 74 additions and 12 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