Changeset 9ae0d2e in sasmodels for explore/beta

Timestamp:
Oct 3, 2018 12:45:25 PM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
2586ab72
Parents:
5d40d0c (diff), a1ec908 (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 beta_approx

Location:
explore/beta
Files:
45 added

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