Merge branch 'master' of https://github.com/engelsen/Instrument-control
Description
Description
Details
Details
- Committed
engelsen Dec 1 2017, 14:37 - Parents
- rINSTCONTROL647f0e02fe7c: Merge branch 'master' of https://github.com/engelsen/Instrument-control
rINSTCONTROL254ce511d284: 1. Fixed positioning of cursor labels in log scale - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 647f0e02fe7c | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Nov 30 2017 | |||
| e1e61ce8aa30 | engelsen | 1. Fixed cleanup methods in MyDaq to accommodate Instrument apps 2. Fixed… | Nov 30 2017 | |||
| 3cd85a7c9eeb | engelsen/GitHub | Merge pull request #105 from engelsen/MyScope-MyInstrument-fixes | Nov 30 2017 | |||
| 9e4d8bd5c023 | engelsen | Merge branch 'MyScope-MyInstrument-fixes' of https://github. | Nov 30 2017 | |||
| 9bcd798f1748 | engelsen | 1. Created app for MyScope called GuiScope 2. Modified MyDaq to work with a… | Nov 30 2017 | |||
| 028e9b22d677 | engelsen/GitHub | Merge pull request #104 from engelsen/MyFit-MyInstrument-fixes | Nov 29 2017 | |||
| 1968664ea2b0 | engelsen/GitHub | Merge branch 'MyScope-MyInstrument-fixes' into MyFit-MyInstrument-fixes | Nov 29 2017 | |||
| b5fc72794f24 | engelsen | 1. Changed str_spec to take any arbitrary string | Nov 29 2017 | |||
| 1bb2fd6a61be | engelsen | 1. Fixes relating to readProperty functionality | Nov 29 2017 | |||
| 394d9d4ddb2c | engelsen | 1. Fixed bugs with MyRsa software 2. Fixed a bug with createSessionPath.m… | Nov 29 2017 | |||
| 268a4e17cce1 | engelsen/GitHub | Merge pull request #102 from engelsen/MyFit-calibration | Nov 28 2017 | |||
| a764b6b613e0 | engelsen/GitHub | Update MyTrace.m | Nov 28 2017 | |||
| 872bd480fb59 | engelsen | 1. Bug fixes on Gui of MyFit.m 2. Bug fixes on calibration of fits 3. Fix merge… | Nov 28 2017 | |||
| f63592f7e2bb | engelsen | Merge branch 'master' into MyFit-calibration | Nov 28 2017 | |||
| 7f398e359c2e | engelsen | 1. Further modification of GUI and calibration functionality of MyFit | Nov 28 2017 | |||
| ec6e32066aa2 | engelsen | 1. Added CalVals struct for calibration values 2. Added function for… | Nov 24 2017 |