Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
amdis-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
amdis
amdis-core
Commits
074f8e52
Commit
074f8e52
authored
6 years ago
by
Praetorius, Simon
Browse files
Options
Downloads
Plain Diff
resolved merge conflict
parents
9a807d6d
64766b4e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/amdis/AdaptInfo.cpp
+8
-23
8 additions, 23 deletions
src/amdis/AdaptInfo.cpp
src/amdis/AdaptInfo.hpp
+189
-87
189 additions, 87 deletions
src/amdis/AdaptInfo.hpp
test/AdaptInfoTest.cpp
+38
-0
38 additions, 0 deletions
test/AdaptInfoTest.cpp
test/CMakeLists.txt
+3
-0
3 additions, 0 deletions
test/CMakeLists.txt
with
238 additions
and
110 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
