Changeset 56b2687 in sasmodels for sasmodels/models/squarewell.py

Timestamp:

Jul 14, 2016 1:35:58 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

98ba1fc

Parents:

61f8638 (diff), fa800e72 (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 polydisp

Conflicts:

README.rst
sasmodels/core.py
sasmodels/data.py
sasmodels/generate.py
sasmodels/kernelcl.py
sasmodels/kerneldll.py
sasmodels/sasview_model.py

File:

• sasmodels/models/squarewell.py (modified) (1 diff)

sasmodels/models/squarewell.py

@@ -14 +14 @@
 The interaction potential is:
 
-  .. image:: img\squarewell.png
+  .. image:: img/squarewell.png
 
 .. math::