Merge branch 'master' into MyFit-calibration
- Conflicts:
- @MyTrace/MyTrace.m
Description
Description
Details
Details
- Committed
engelsen Nov 28 2017, 14:21 - Parents
- rINSTCONTROL7f398e359c2e: 1. Further modification of GUI and calibration functionality of MyFit
rINSTCONTROL5ac025096528: 1. Made MyDaq compatible with new MyTrace changes 2. Cleaned up MyTrace.m - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 5ac025096528 | engelsen | 1. Made MyDaq compatible with new MyTrace changes 2. Cleaned up MyTrace.m | Nov 28 2017 | |||
| 687fbc40b261 | engelsen | 1. Allow plot function of MyTrace to change interpreter of labels | Nov 28 2017 | |||
| f666d41a7f2f | engelsen | 1. Changed MyTrace plot function to take all formatting inputs of the plot and… | Nov 28 2017 | |||
| b5509c907ae8 | engelsen | GuiNa cosmetic edits | Nov 27 2017 | |||
| 96e4cf9e939b | SAFedorov/GitHub | Merge pull request #101 from engelsen/DynamicProps | Nov 27 2017 | |||
| d1a580a8b700 | engelsen | 1. Fixed the Trace.save method 2. Added createSessionPath function | Nov 27 2017 |