Changeset 51973e1 in sasmodels for sasmodels/kernel_iq.c

Timestamp:
Apr 18, 2016 5:46:24 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:
3a45c2c
Parents:
ee72c70 (diff), f36c1b7 (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 branch 'master' into polydisp

Conflicts:

sasmodels/sasview_model.py

File:
1 added

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