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

!! Database migration and maintenance has neen rescheduled to Thu 8.5. from 08:00. !!

!! 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. !!

9a9eb50a

Commit 9a9eb50a authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'master' into feature/240/shortcuts

parents c57e2acf 4ece34db

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui/src/camera.cpp 2 additions, 2 deletions

applications/gui/src/camera.cpp
applications/gui/src/media_panel.cpp 2 additions, 2 deletions

applications/gui/src/media_panel.cpp
applications/gui/src/screen.cpp 9 additions, 5 deletions

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

applications/gui/src/screen.hpp

with 17 additions and 15 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