Skip to content
Snippets Groups Projects
Commit 05294d83 authored by pospelov's avatar pospelov
Browse files

Merge branch 'develop' of apps.jcns.fz-juelich.de:BornAgain into develop 

Conflicts:
	Core/Core.pro
	Examples/Performance/perf_history.txt
	Fit/Fit.pro
parents 17b60b0f 34bde621
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment