Changeset cb97bff in sasmodels for sasmodels/models/img

Timestamp:
Mar 16, 2016 4:59:52 PM (8 years ago)
Author:
smk78
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:
310ddcb, bf227cd
Parents:
38d2c97 (diff), 5be92e8 (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' of https://github.com/SasView/sasmodels

Conflicts:

sasmodels/models/adsorbed_layer.py

Location:
sasmodels/models/img
Files:
4 added
1 deleted
23 moved

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