Changeset 82d88d5 in sasview

Timestamp:
Mar 6, 2019 6:18:09 PM (7 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249
Children:
f923967
Parents:
cb64d86 (diff), f205d3a (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 py37-sasgui

Files:
10 added
5 deleted
155 edited
8 moved

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