Merge branch 'master' into 15289_declareProperty_uniqueptr
re #15289 # Conflicts: # Framework/DataHandling/src/GroupDetectors.cpp # Framework/DataHandling/src/GroupDetectors2.cpp # Framework/DataHandling/src/LoadMuonNexus.cpp # Framework/DataHandling/src/LoadRaw3.cpp # Framework/DataHandling/src/LoadRawBin0.cpp # Framework/DataHandling/src/LoadTOFRawNexus.cpp # Framework/DataHandling/src/MaskDetectors.cpp # Framework/LiveData/src/ISISHistoDataListener.cpp # Framework/LiveData/src/StartLiveData.cpp # Framework/LiveData/test/ISISHistoDataListenerTest.h
Please register or sign in to comment