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

Maintenance on Tuesday 15.4. at 14:00. ETA 60 - 90 minutes.

1a338ed3

Commit 1a338ed3 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'master' into feature/gui

parents 76b2a4e0 40be6d53

No related branches found

No related tags found

Loading

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

components/common/cpp/CMakeLists.txt 3 additions, 0 deletions

components/common/cpp/CMakeLists.txt
components/common/cpp/include/ftl/configurable.hpp 64 additions, 1 deletion

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

components/common/cpp/src/configurable.cpp
components/common/cpp/test/CMakeLists.txt 16 additions, 0 deletions

components/common/cpp/test/CMakeLists.txt
components/common/cpp/test/catch.hpp 14362 additions, 0 deletions

components/common/cpp/test/catch.hpp
components/common/cpp/test/configurable_unit.cpp 67 additions, 0 deletions

components/common/cpp/test/configurable_unit.cpp
components/common/cpp/test/tests.cpp 3 additions, 0 deletions

components/common/cpp/test/tests.cpp
config/config.json 1 addition, 0 deletions

config/config.json
config/config_localhost.json 46 additions, 1 deletion

config/config_localhost.json
config/config_voxhash.json 1 addition, 0 deletions

config/config_voxhash.json

with 14596 additions and 2 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