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

Merge branch 'MesoFit' 

Conflicts:
	Core/PythonAPI/src/PythonModule.cpp
	Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
	Fit/PythonAPI/src/PythonModule.cpp
	Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
	Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
	Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
	Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
parents cc295b8d 1d33c0c5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 260 additions and 104 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