Skip to content
Snippets Groups Projects
Commit 8e6ddb6f authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

Merge branch 'RectDetector' into develop 

Conflicts:
	Core/Algorithms/inc/GISASSimulation.h
	Core/Algorithms/inc/RectangularDetector.h
	Core/PythonAPI/src/IDetector2D.pypp.cpp
	Core/PythonAPI/src/RectangularDetector.pypp.cpp
	Tests/UnitTests/TestCore/BeamTest.h
parents 21f43425 695816d7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 971 additions and 155 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