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

46866b30

Commit 46866b30 authored 9 years ago by Van Herck, Walter

Downloads
- Plain Diff

Merge branch 'roughnessbug' into develop

Conflicts:
	GUI/coregui/Models/JobModel.cpp

parents 32eed917 37697a95

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Core/Algorithms/MultiLayerDWBASimulation.cpp 4 additions, 0 deletions

Core/Algorithms/MultiLayerDWBASimulation.cpp
Core/Algorithms/MultiLayerRoughnessDWBASimulation.cpp 9 additions, 8 deletions

Core/Algorithms/MultiLayerRoughnessDWBASimulation.cpp
Core/StandardSamples/MesoCrystalBuilder.cpp 2 additions, 2 deletions

Core/StandardSamples/MesoCrystalBuilder.cpp
GUI/coregui/Views/FitWidgets/FitTools.cpp 1 addition, 1 deletion

GUI/coregui/Views/FitWidgets/FitTools.cpp
Tests/ReferenceData/BornAgain/mesocrystal01_reference.int.gz 0 additions, 0 deletions

Tests/ReferenceData/BornAgain/mesocrystal01_reference.int.gz
Tests/ReferenceData/BornAgain/ref_MesoCrystal.int.gz 0 additions, 0 deletions

Tests/ReferenceData/BornAgain/ref_MesoCrystal.int.gz
Tests/ReferenceData/BornAgain/ref_MultiLayerWithRoughness.int.gz 0 additions, 0 deletions

...eferenceData/BornAgain/ref_MultiLayerWithRoughness.int.gz
Tests/ReferenceData/BornAgain/roughness01_reference.int.gz 0 additions, 0 deletions

Tests/ReferenceData/BornAgain/roughness01_reference.int.gz

with 16 additions and 11 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