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

f1cec707

Commit f1cec707 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'bug/multiframesetdraw' into 'master'

Resolves a recent multi-frameset update bug

See merge request nicolas.pope/ftl!269

parents 0cbd95da 7b8d6566

No related branches found

No related tags found

Loading

Pipeline #22320 passed 5 years ago

Stage: all

Stage: deploy

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui/src/camera.cpp 12 additions, 6 deletions

applications/gui/src/camera.cpp
applications/gui/src/camera.hpp 7 additions, 1 deletion

applications/gui/src/camera.hpp
applications/gui/src/screen.cpp 6 additions, 0 deletions

applications/gui/src/screen.cpp
applications/gui/src/src_window.cpp 7 additions, 5 deletions

applications/gui/src/src_window.cpp

with 32 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