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

Merge remote-tracking branch 'upstream/develop' into FittingAPI 

# Conflicts:
#	auto/Wrap/libBornAgainCore.py
#	auto/Wrap/libBornAgainCore_wrap.cpp
#	auto/Wrap/libBornAgainFit.py
#	auto/Wrap/libBornAgainFit_wrap.cpp
parents 1b08ae4f 11de58ad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 138 additions and 79 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