Framework/Algorithms/src/CreateCalFileByNames.cpp · 587a709227e5304fe4c7e28ee9cde77e639a41cf · mantidproject / mantid

"Code/Mantid/Framework/Kernel/src/ConfigService.cpp" did not exist on "a0336a1739c76bf2dbbe123d1a79a153b7beb98d"

9 years ago

Merge remote-tracking branch 'origin/master' into 11035_separate_workspace_validators · d13d08ee

Roman Tolchenov authored 9 years ago

Conflicts:
	Framework/Algorithms/src/CopyInstrumentParameters.cpp
	Framework/Algorithms/src/CropWorkspace.cpp
	Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
	Framework/Algorithms/src/FindCenterOfMassPosition.cpp
	Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
	Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
	Framework/Algorithms/src/GetDetectorOffsets.cpp
	Framework/Algorithms/src/MaskDetectorsIf.cpp
	Framework/Algorithms/src/NormaliseToMonitor.cpp
	Framework/Algorithms/src/Q1DWeighted.cpp
	Framework/Algorithms/src/SANSDirectBeamScaling.cpp
	Framework/Algorithms/src/SolidAngle.cpp
Re #11035

d13d08ee

History

Merge remote-tracking branch 'origin/master' into 11035_separate_workspace_validators

Roman Tolchenov authored 9 years ago

Conflicts:
	Framework/Algorithms/src/CopyInstrumentParameters.cpp
	Framework/Algorithms/src/CropWorkspace.cpp
	Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
	Framework/Algorithms/src/FindCenterOfMassPosition.cpp
	Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
	Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
	Framework/Algorithms/src/GetDetectorOffsets.cpp
	Framework/Algorithms/src/MaskDetectorsIf.cpp
	Framework/Algorithms/src/NormaliseToMonitor.cpp
	Framework/Algorithms/src/Q1DWeighted.cpp
	Framework/Algorithms/src/SANSDirectBeamScaling.cpp
	Framework/Algorithms/src/SolidAngle.cpp
Re #11035

Code owners

Assign users and groups as approvers for specific file changes. Learn more.