Merge branch 'master' of https://github.com/mantidproject/mantid into 28407_remove_algorithm_proxy
# Conflicts: # Framework/API/inc/MantidAPI/AlgorithmProxy.h # Framework/API/src/AlgorithmProxy.cpp # Framework/API/test/AlgorithmProxyTest.h # Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProxy.cpp
Too many changes to show.
To preserve performance only 20 of 1000+ files are displayed.
Please register or sign in to comment