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

Merge branch 'FitManual'

Conflicts:
	CMakeLists.txt
	Core/PythonAPI/src/FormFactorGauss.pypp.cpp
parents 097bd31f 71731a1e
No related branches found
No related tags found
No related merge requests found
Showing
with 1291 additions and 409 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment