Merge branch 'master' of https://github.com/engelsen/Instrument-control
- Conflicts:
- @MyFit/createGui.m
engelsen | Oct 19 2017, 12:19 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
f84cd1e87618 | engelsen | 1. GUI updates | Oct 19 2017 | |||
f0536b50634f | engelsen | 1. MyFit.m GUI modifications 2. | Oct 19 2017 | |||
6c761e2a29f3 | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Oct 18 2017 | |||
5c94a22b75bf | engelsen | 1. Added functionality plotting fit functions live when parameters are changed | Oct 18 2017 |