Skip to content
Snippets Groups Projects
Commit e561d02d authored by pospelov's avatar pospelov
Browse files

Merge branch 'chimodule' into develop 

Conflicts:
	App/src/TestIsGISAXS12.cpp
	Core/Algorithms/src/Experiment.cpp
parents 1db7e8ec fbf88705
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 602 additions and 238 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