Code/Mantid/Framework/Kernel/src/Memory.cpp · 34b0a617de41b067461809dd08fef45c4d20c6b0 · mantidproject / mantid

10 years ago

Merge branch 'master' into feature/10271_tcmalloc_ldpreload · 3b15699e

Gigg, Martyn Anthony authored 10 years ago

Conflicts:
	Code/Mantid/Build/CMake/FindTcmalloc.cmake
	Code/Mantid/Framework/API/src/MemoryManager.cpp
	Code/Mantid/Framework/Kernel/CMakeLists.txt
	Code/Mantid/Framework/Kernel/src/Memory.cpp
	Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
	Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
	Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
Refs #10271

3b15699e

History

Merge branch 'master' into feature/10271_tcmalloc_ldpreload

Gigg, Martyn Anthony authored 10 years ago

Conflicts:
	Code/Mantid/Build/CMake/FindTcmalloc.cmake
	Code/Mantid/Framework/API/src/MemoryManager.cpp
	Code/Mantid/Framework/Kernel/CMakeLists.txt
	Code/Mantid/Framework/Kernel/src/Memory.cpp
	Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
	Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
	Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
Refs #10271

Code owners

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