Changeset 7af652d in sasview

Timestamp:
Mar 5, 2019 2:26:14 PM (5 years ago)
Author:
GitHub <noreply@…>
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249
Children:
1342f6a
Parents:
dbfd307 (diff), 8c9e65c (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.
git-author:
Paul Kienzle <pkienzle@…> (03/05/19 14:26:14)
git-committer:
GitHub <noreply@…> (03/05/19 14:26:14)
Message:

Merge branch 'master' into py37-sascalc

Files:
10 added
8 deleted
49 edited
8 moved

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