Changeset 840ac87 in sasview

Timestamp:
Sep 20, 2018 12:44:12 PM (3 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
ticket-1094-headless
Children:
1dc134e6
Parents:
a072198 (diff), 912e645 (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 ticket-1094-headless

Files:
13 added
2 deleted
41 edited

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