Changeset 7b15990 in sasview

Timestamp:
Sep 18, 2017 2:45:52 PM (2 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
costrafo411
Parents:
9f59333 (diff), cfd27dd (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 costrafo411

Files:
45 added
31 deleted
122 edited
4 moved

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