Changeset 4b0e1f3 in sasmodels for sasmodels/models/line.py

Timestamp:
Mar 14, 2016 6:34:58 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:
56fac50
Parents:
41c7e68 (diff), bea7acb (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

(No files)

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