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

f70a7b98

Commit f70a7b98 authored 10 years ago by Ganeva, Marina

Downloads
- Plain Diff

Merge branch 'develop' of git://apps.jcns.fz-juelich.de/BornAgain into develop

parents 08beaf41 bb64394d

Branches

Tags

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
Core/FormFactors/src/FormFactorTruncatedCube.cpp 1 addition, 1 deletion

Core/FormFactors/src/FormFactorTruncatedCube.cpp
Core/Samples/src/InterferenceFunction2DLattice.cpp 6 additions, 4 deletions

Core/Samples/src/InterferenceFunction2DLattice.cpp
GUI/main/CMakeLists.txt 1 addition, 1 deletion

GUI/main/CMakeLists.txt
Tests/ReferenceData/BornAgain/isgisaxs06_reference_centered.int.gz 0 additions, 0 deletions

...erenceData/BornAgain/isgisaxs06_reference_centered.int.gz
Tests/ReferenceData/BornAgain/isgisaxs06_reference_lattice.int.gz 0 additions, 0 deletions

...ferenceData/BornAgain/isgisaxs06_reference_lattice.int.gz
Tests/ReferenceData/BornAgain/isgisaxs06_reference_rotated.int.gz 0 additions, 0 deletions

...ferenceData/BornAgain/isgisaxs06_reference_rotated.int.gz
Tests/ReferenceData/BornAgain/isgisaxs06_reference_variants.int.gz 0 additions, 0 deletions

...erenceData/BornAgain/isgisaxs06_reference_variants.int.gz
Tests/UnitTests/TestCore/DistributionsTest.h 1 addition, 1 deletion

Tests/UnitTests/TestCore/DistributionsTest.h
trans3d.txt 0 additions, 33 deletions

trans3d.txt

with 10 additions and 41 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