Changeset 2cda197 in sasview

Timestamp:
Apr 16, 2017 1:09:37 PM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
Children:
4fa82f8
Parents:
7f0c93f (diff), e5cbbce (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 load_speed_increase

Files:
6 added
1 deleted
19 edited
2 moved

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