Merge branch 'master' into 11209_merge_mdevents_and_dataobjects
Conflicts: Code/Mantid/Framework/MDAlgorithms/src/FitMD.cpp Code/Mantid/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp Refs #11209
No related branches found
No related tags found
Showing
- Code/Mantid/Build/CMake/DarwinSetup.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/DarwinSetup.cmake
- Code/Mantid/Build/CMake/FindJsonCPP.cmake 0 additions, 5 deletionsCode/Mantid/Build/CMake/FindJsonCPP.cmake
- Code/Mantid/Build/CMake/GNUSetup.cmake 3 additions, 2 deletionsCode/Mantid/Build/CMake/GNUSetup.cmake
- Code/Mantid/Framework/API/CMakeLists.txt 4 additions, 0 deletionsCode/Mantid/Framework/API/CMakeLists.txt
- Code/Mantid/Framework/API/inc/MantidAPI/DomainCreatorFactory.h 1 addition, 1 deletion...Mantid/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
- Code/Mantid/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h 5 additions, 0 deletions.../Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
- Code/Mantid/Framework/API/inc/MantidAPI/IRemoteJobManager.h 280 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IRemoteJobManager.h
- Code/Mantid/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h 124 additions, 0 deletions...tid/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
- Code/Mantid/Framework/API/inc/MantidAPI/ScopedWorkspace.h 1 addition, 1 deletionCode/Mantid/Framework/API/inc/MantidAPI/ScopedWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h 3 additions, 3 deletionsCode/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
- Code/Mantid/Framework/API/src/FunctionParameterDecorator.cpp 19 additions, 4 deletionsCode/Mantid/Framework/API/src/FunctionParameterDecorator.cpp
- Code/Mantid/Framework/API/src/LinearScale.cpp 1 addition, 1 deletionCode/Mantid/Framework/API/src/LinearScale.cpp
- Code/Mantid/Framework/API/src/LogManager.cpp 7 additions, 7 deletionsCode/Mantid/Framework/API/src/LogManager.cpp
- Code/Mantid/Framework/API/src/LogarithmScale.cpp 1 addition, 1 deletionCode/Mantid/Framework/API/src/LogarithmScale.cpp
- Code/Mantid/Framework/API/src/RemoteJobManagerFactory.cpp 88 additions, 0 deletionsCode/Mantid/Framework/API/src/RemoteJobManagerFactory.cpp
- Code/Mantid/Framework/API/test/CostFunctionFactoryTest.h 1 addition, 1 deletionCode/Mantid/Framework/API/test/CostFunctionFactoryTest.h
- Code/Mantid/Framework/API/test/FuncMinimizerFactoryTest.h 1 addition, 1 deletionCode/Mantid/Framework/API/test/FuncMinimizerFactoryTest.h
- Code/Mantid/Framework/API/test/FunctionFactoryTest.h 4 additions, 4 deletionsCode/Mantid/Framework/API/test/FunctionFactoryTest.h
- Code/Mantid/Framework/API/test/FunctionParameterDecoratorTest.h 32 additions, 4 deletions...antid/Framework/API/test/FunctionParameterDecoratorTest.h
- Code/Mantid/Framework/API/test/FunctionPropertyTest.h 1 addition, 1 deletionCode/Mantid/Framework/API/test/FunctionPropertyTest.h
Loading
Please register or sign in to comment