Merge branch 'master' into feature/10306_better_run_button_handling_in_idr
Refs #10306
No related branches found
No related tags found
Showing
- Code/Mantid/Build/CMake/DarwinSetup.cmake 1 addition, 3 deletionsCode/Mantid/Build/CMake/DarwinSetup.cmake
- Code/Mantid/Build/CMake/FindPyQt.py 40 additions, 17 deletionsCode/Mantid/Build/CMake/FindPyQt.py
- Code/Mantid/Build/CMake/FindPyQt4.cmake 38 additions, 15 deletionsCode/Mantid/Build/CMake/FindPyQt4.cmake
- Code/Mantid/CMakeLists.txt 1 addition, 0 deletionsCode/Mantid/CMakeLists.txt
- Code/Mantid/Framework/API/CMakeLists.txt 3 additions, 0 deletionsCode/Mantid/Framework/API/CMakeLists.txt
- Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h 34 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/SampleShapeValidator.h 52 additions, 0 deletions...Mantid/Framework/API/inc/MantidAPI/SampleShapeValidator.h
- Code/Mantid/Framework/API/src/MatrixWorkspace.cpp 282 additions, 0 deletionsCode/Mantid/Framework/API/src/MatrixWorkspace.cpp
- Code/Mantid/Framework/API/src/SampleShapeValidator.cpp 50 additions, 0 deletionsCode/Mantid/Framework/API/src/SampleShapeValidator.cpp
- Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h 471 additions, 0 deletionsCode/Mantid/Framework/API/test/MatrixWorkspaceTest.h
- Code/Mantid/Framework/API/test/SampleShapeValidatorTest.h 46 additions, 0 deletionsCode/Mantid/Framework/API/test/SampleShapeValidatorTest.h
- Code/Mantid/Framework/Algorithms/src/ElasticWindow.cpp 94 additions, 47 deletionsCode/Mantid/Framework/Algorithms/src/ElasticWindow.cpp
- Code/Mantid/Framework/Algorithms/src/Integration.cpp 38 additions, 5 deletionsCode/Mantid/Framework/Algorithms/src/Integration.cpp
- Code/Mantid/Framework/Algorithms/test/ElasticWindowTest.h 46 additions, 4 deletionsCode/Mantid/Framework/Algorithms/test/ElasticWindowTest.h
- Code/Mantid/Framework/Algorithms/test/IntegrationTest.h 96 additions, 0 deletionsCode/Mantid/Framework/Algorithms/test/IntegrationTest.h
- Code/Mantid/Framework/CurveFitting/CMakeLists.txt 7 additions, 2 deletionsCode/Mantid/Framework/CurveFitting/CMakeLists.txt
- Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h 148 additions, 0 deletions.../CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
- Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ConvertToYSpace.h 1 addition, 0 deletions...ork/CurveFitting/inc/MantidCurveFitting/ConvertToYSpace.h
- Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/MSVesuvioHelpers.h 75 additions, 0 deletions...rk/CurveFitting/inc/MantidCurveFitting/MSVesuvioHelpers.h
- Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/VesuvioResolution.h 11 additions, 5 deletions...k/CurveFitting/inc/MantidCurveFitting/VesuvioResolution.h
Loading
Please register or sign in to comment