-
Samuel Ross Meehan authored
Merge branch 'master' into 'add-license' by resolving merge conflicts to preserve the jumbo frames configuration and the pulse generation scripts # Conflicts: # README.md # digitizer-daq/Comm_vx1730.cpp
9154f309
Merge branch 'master' into 'add-license' by resolving merge conflicts to preserve the jumbo frames configuration and the pulse generation scripts # Conflicts: # README.md # digitizer-daq/Comm_vx1730.cpp