Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arbor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
arbor-sim
arbor
Commits
de11fdb8
Commit
de11fdb8
authored
8 years ago
by
Sam Yates
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into feature/better-clargs
* Resolves some conflicts.
parents
7e47324e
cc35b618
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
miniapp/io.cpp
+7
-4
7 additions, 4 deletions
miniapp/io.cpp
src/util/nop.hpp
+29
-0
29 additions, 0 deletions
src/util/nop.hpp
tests/unit/CMakeLists.txt
+1
-0
1 addition, 0 deletions
tests/unit/CMakeLists.txt
tests/unit/test_nop.cpp
+75
-0
75 additions, 0 deletions
tests/unit/test_nop.cpp
with
112 additions
and
4 deletions
Preview
0%
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
