Merge branch 'master' of https://github.com/engelsen/Instrument-control
- Conflicts:
- @MyDaq/MyDaq.m
- GUIs/GuiDaq.fig
- GUIs/GuiDaq.m
Description
Description
Details
Details
- Committed
engelsen Oct 26 2017, 11:03 - Parents
- rINSTCONTROL1221d4833a55: 1. Removed redundant Deletion events and its triggers. Now using…
rINSTCONTROL53a8ad479968: 1. Bug fixes with instruments in MyDaq.m 2. Fixed bug with DataToRef and… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 53a8ad479968 | engelsen | 1. Bug fixes with instruments in MyDaq.m 2. Fixed bug with DataToRef and… | Oct 25 2017 |