Code/Mantid/Framework/Kernel/src/ConfigService.cpp · a1e95461ff50a77c66e93de9f1810548901dbdbe · mantidproject / mantid

11 years ago

Michael Reuter authored 11 years ago

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:
	Code/Mantid/Build/CMake/DarwinSetup.cmake

4093c4d7

Michael Reuter authored 11 years ago

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:
	Code/Mantid/Build/CMake/DarwinSetup.cmake

Code owners

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