Merge branch 'master' into Data-saving-edits
Description
Description
Details
Details
- Committed
GitHub <noreply@github.com> May 30 2018, 15:10 - Parents
- rINSTCONTROL46b60fced52e: Merge pull request #127 from engelsen/Running-instrument-container
rINSTCONTROLbaa1baa5f07f: 1. Added functionality to PeakFinder - Branches
- Unknown
- Tags
- References
- refs/pull/128/head
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 46b60fced52e | engelsen/GitHub | Merge pull request #127 from engelsen/Running-instrument-container | May 30 2018 | |||
| 1d8721493e4f | SAFedorov/GitHub | Merge pull request #124 from engelsen/Collector | May 30 2018 | |||
| f7d4f3e6d8da | engelsen | Added some basic checks for instrument name | May 30 2018 | |||
| a10c40699957 | engelsen | Acquiring instrument now in header | May 30 2018 | |||
| dd26bc7d5eb5 | engelsen | Changed Daq to receive from only selected instrument | May 9 2018 | |||
| 31337406c578 | engelsen | DAQmenu handling of Collector | May 9 2018 | |||
| 95ee06d3f789 | engelsen | Minimum functionality restored | May 7 2018 | |||
| a580b8b57020 | engelsen | Cleaned up DAQ | May 7 2018 | |||
| 989c7d4bcfe4 | engelsen | Access protection | May 7 2018 | |||
| 46889984aa86 | engelsen | Added Metadata property to MyTrace | May 7 2018 | |||
| c2b16d8550ba | SAFedorov | AutoRBW is added to My RSA and Gui RSA | Feb 15 2018 |