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

cc3bfde2

Commit cc3bfde2 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'feature/240/shortcuts' into 'master'

Implements #240 custom shortcuts

Closes #240

See merge request nicolas.pope/ftl!181

parents 4ece34db 78ad3d55

No related branches found

No related tags found

1 merge request!181Implements #240 custom shortcuts

Pipeline #16762 passed 5 years ago

Stage: all

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui/src/main.cpp 2 additions, 0 deletions

applications/gui/src/main.cpp
applications/gui/src/screen.cpp 58 additions, 4 deletions

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

applications/gui/src/screen.hpp
applications/reconstruct/src/main.cpp 1 addition, 1 deletion

applications/reconstruct/src/main.cpp
components/common/cpp/include/ftl/configuration.hpp 2 additions, 0 deletions

components/common/cpp/include/ftl/configuration.hpp
components/common/cpp/src/configuration.cpp 63 additions, 7 deletions

components/common/cpp/src/configuration.cpp

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