Skip to content
Snippets Groups Projects
Commit 840af596 authored by pospelov's avatar pospelov
Browse files

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

Conflicts:
	App/src/AppDict.cpp
parents a7f74c14 09995f2f
No related branches found
No related tags found
No related merge requests found
Showing
with 271 additions and 305 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment