Changeset 541e7c9 in sasmodels for sasmodels/modelinfo.py

Timestamp:
Apr 6, 2016 7:27:46 PM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
4937980
Parents:
ee8f734 (diff), 0278e3f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/models/lib/Si.c
sasmodels/models/lib/polevl.c
sasmodels/models/lib/sas_J0.c
sasmodels/models/lib/sas_J1.c
sasmodels/models/lib/sas_JN.c

File:
1 added

Note: See TracChangeset for help on using the changeset viewer.