Framework/Kernel/test/PropertyManagerPropertyTest.h · 2970ef1edf0aefde6260a088be83dd37484e9632 · mantidproject / mantid

8 years ago

Merge branch 'master' into sampleenvironment-xml-definition · 6ad8f7ea

Martyn Gigg authored 8 years ago

Conflicts:
	Framework/Algorithms/test/MonteCarloAbsorptionTest.h
	Framework/DataHandling/CMakeLists.txt
	Framework/Kernel/test/PropertyManagerPropertyTest.h
Refs #16044

6ad8f7ea

History

Merge branch 'master' into sampleenvironment-xml-definition

Martyn Gigg authored 8 years ago

Conflicts:
	Framework/Algorithms/test/MonteCarloAbsorptionTest.h
	Framework/DataHandling/CMakeLists.txt
	Framework/Kernel/test/PropertyManagerPropertyTest.h
Refs #16044

Code owners

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