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

Merge branch 'SampleBuilderPtr' 

Conflicts:
	Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
	Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp
	Core/PythonAPI/src/PythonModule.cpp
	Core/python_module.pri
parents e7358862 9e84d435
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 196 additions and 114 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