Changeset 4937980 in sasmodels for sasmodels/models/flexible_cylinder.c

Timestamp:

Apr 6, 2016 7:46:11 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:

cb3a824, 8bd7b77

Parents:

541e7c9 (diff), e6408d0 (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 remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/models/flexible_cylinder.c

File:

• sasmodels/models/flexible_cylinder.c (modified) (1 diff)

sasmodels/models/flexible_cylinder.c

@@ -2 +2 @@
 form_volume(length, kuhn_length, radius)
 {
-    return 1.;
+    return 1.0;
 }