Ignore:
Timestamp:
Jan 18, 2017 12:58:22 PM (7 years ago)
Author:
richardh
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
6431056
Parents:
8afefae (diff), daeef4c (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:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_shell_bicelle_elliptical.py

    r8afefae r3b9a526  
    133133# pylint: enable=bad-whitespace, line-too-long 
    134134 
    135 source = ["lib/Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c","core_shell_bicelle_elliptical.c"] 
     135source = ["lib/sas_Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", 
     136          "core_shell_bicelle_elliptical.c"] 
    136137 
    137138demo = dict(scale=1, background=0, 
Note: See TracChangeset for help on using the changeset viewer.