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

Merge branch 'Genetic' 

Conflicts:
	Core/PythonAPI/src/PythonModule.cpp
	Fit/PythonAPI/src/IMinimizer.pypp.cpp
	Fit/PythonAPI/src/PythonModule.cpp
parents b880ee90 9e272d50
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 497 additions and 550 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