Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BornAgain
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

caba614e

Commit caba614e authored 7 years ago by Pospelov, Gennady

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into MinimizerCatalogue

# Conflicts:
#	dev-tools/log/perf_history.txt

parents 1b971891 b00a0b80

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Examples/python/fitting/ex09_FitSpecular/FitSpecularBasics.py 1 addition, 1 deletion

...ples/python/fitting/ex09_FitSpecular/FitSpecularBasics.py
Tests/Functional/Core/CoreSpecial/CMakeLists.txt 1 addition, 0 deletions

Tests/Functional/Core/CoreSpecial/CMakeLists.txt
Tests/Functional/Core/CoreSpecial/CoreSpecialTestFactory.cpp 5 additions, 0 deletions

Tests/Functional/Core/CoreSpecial/CoreSpecialTestFactory.cpp
Tests/Functional/Core/CoreSpecial/DetectorTest.cpp 164 additions, 0 deletions

Tests/Functional/Core/CoreSpecial/DetectorTest.cpp
Tests/Functional/Core/CoreSpecial/DetectorTest.h 58 additions, 0 deletions

Tests/Functional/Core/CoreSpecial/DetectorTest.h
Tests/Functional/TestMachinery/Benchmark.h 3 additions, 1 deletion

Tests/Functional/TestMachinery/Benchmark.h
dev-tools/log/perf_history.txt 8 additions, 6 deletions

dev-tools/log/perf_history.txt

with 240 additions and 8 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