Homec4science

Merge branch 'master' of https://github.com/engelsen/Instrument-control

Authored by engelsen on Oct 26 2017, 11:03.

Description

Merge branch 'master' of https://github.com/engelsen/Instrument-control

  1. Conflicts:
  2. @MyDaq/MyDaq.m
  3. GUIs/GuiDaq.fig
  4. GUIs/GuiDaq.m

Merged Changes

CommitAuthorDetailsCommitted
53a8ad479968engelsen
1. Bug fixes with instruments in MyDaq.m 2. Fixed bug with DataToRef and… 
Oct 25 2017