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

dab1353e

Commit dab1353e authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'feature/local-gui-configuration' into 'master'

Feature/local gui configuration

See merge request nicolas.pope/ftl!150

parents 309d9632 96105d32

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/gui/src/config_window.cpp 108 additions, 29 deletions

applications/gui/src/config_window.cpp
applications/gui/src/config_window.hpp 12 additions, 3 deletions

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

applications/gui/src/screen.cpp
components/common/cpp/include/ftl/configurable.hpp 3 additions, 2 deletions

components/common/cpp/include/ftl/configurable.hpp
components/common/cpp/src/configurable.cpp 0 additions, 4 deletions

components/common/cpp/src/configurable.cpp
components/net/cpp/CMakeLists.txt 2 additions, 1 deletion

components/net/cpp/CMakeLists.txt
components/net/cpp/include/ftl/net_configurable.hpp 26 additions, 0 deletions

components/net/cpp/include/ftl/net_configurable.hpp
components/net/cpp/src/net_configurable.cpp 12 additions, 0 deletions

components/net/cpp/src/net_configurable.cpp
components/net/cpp/test/CMakeLists.txt 9 additions, 0 deletions

components/net/cpp/test/CMakeLists.txt
components/net/cpp/test/net_configurable_unit.cpp 43 additions, 0 deletions

components/net/cpp/test/net_configurable_unit.cpp

with 245 additions and 45 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