Skip to content
Snippets Groups Projects
Commit 01b5d614 authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Merge branch 'bin_axis' into develop 

Conflicts:
	App/src/IsGISAXSTools.cpp
	App/src/TestIsGISAXS9.cpp
	Core/Algorithms/src/GISASExperiment.cpp
	Core/Tools/inc/AxisDouble.h
	Core/Tools/inc/OutputData.h
	Core/Tools/src/AxisDouble.cpp
	shared.pri
parents 94fa348b 1364a13c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 214 additions and 122 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment