Merge branch 'MyScope-MyInstrument-fixes' of https://github.com/engelsen/Instrument-control into MyScope-MyInstrument-fixes
Description
Description
Details
Details
- Committed
engelsen Nov 30 2017, 15:30 - Parents
- rINSTCONTROL9bcd798f1748: 1. Created app for MyScope called GuiScope 2. Modified MyDaq to work with a…
rINSTCONTROL028e9b22d677: Merge pull request #104 from engelsen/MyFit-MyInstrument-fixes - Branches
- Unknown
- Tags
- References
- refs/pull/105/head
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 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 |