Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BornAgain
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

10ff0d17

Commit 10ff0d17 authored 8 years ago by Pospelov, Gennady

Downloads
- Plain Diff

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

parents 043d845f 2a88d7a4

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 2 additions, 0 deletions

CHANGELOG
Core/SoftParticle/FormFactorGauss.cpp 2 additions, 2 deletions

Core/SoftParticle/FormFactorGauss.cpp
Core/SoftParticle/FormFactorGauss.h 1 addition, 1 deletion

Core/SoftParticle/FormFactorGauss.h
Core/SoftParticle/FormFactorLorentz.cpp 3 additions, 4 deletions

Core/SoftParticle/FormFactorLorentz.cpp
Core/SoftParticle/FormFactorLorentz.h 1 addition, 1 deletion

Core/SoftParticle/FormFactorLorentz.h
Doc/UserManual/Assemblies.tex 77 additions, 0 deletions

Doc/UserManual/Assemblies.tex
Wrap/swig/extendFit.i 6 additions, 0 deletions

Wrap/swig/extendFit.i
auto/Wrap/libBornAgainFit.py 53 additions, 63 deletions

auto/Wrap/libBornAgainFit.py
auto/Wrap/libBornAgainFit_wrap.cpp 200 additions, 51 deletions

auto/Wrap/libBornAgainFit_wrap.cpp
auto/Wrap/libBornAgainFit_wrap.h 1 addition, 1 deletion

auto/Wrap/libBornAgainFit_wrap.h

with 346 additions and 123 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 sign in to comment