Changeset 1356d60 in sasmodels

Timestamp:
Mar 15, 2016 3:13:39 AM (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:
4a4ae41
Parents:
7dca202 (diff), 5ceb7d0 (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/generate.py

File:
1 deleted

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