Homec4science

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

Authored by engelsen on Oct 19 2017, 12:19.

Description

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

  1. Conflicts:
  2. @MyFit/createGui.m

Details

Committed
engelsenOct 19 2017, 12:19
Parents
rINSTCONTROLf84cd1e87618: 1. GUI updates
rINSTCONTROLa9a83cba6752: 1. GUI optimization
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
f84cd1e87618engelsen
1. GUI updates 
Oct 19 2017
f0536b50634fengelsen
1. MyFit.m GUI modifications 2. 
Oct 19 2017
6c761e2a29f3engelsen
Merge branch 'master' of https://github.com/engelsen/Instrument-control 
Oct 18 2017
5c94a22b75bfengelsen
1. Added functionality plotting fit functions live when parameters are changed 
Oct 18 2017