Changeset cedad32 in sasmodels for sasmodels/convert.py

Timestamp:

Mar 20, 2016 4:43:56 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:

2f63032

Parents:

0a7eec11 (diff), bad8b12 (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

File:

• sasmodels/convert.py (modified) (1 diff)

sasmodels/convert.py

@@ -17 +17 @@
     'fractal_core_shell',
     'binary_hard_sphere',
+    'raspberry'
 ]