Merge branch 'master' into 13330_MolDyn_work_for_v3_and_v4
Re #13330
No related branches found
No related tags found
Showing
- Code/Mantid/Build/CMake/NSIS.template.in 42 additions, 77 deletionsCode/Mantid/Build/CMake/NSIS.template.in
- Code/Mantid/Build/CMake/Packaging/launch_mantidplot.bat 35 additions, 0 deletionsCode/Mantid/Build/CMake/Packaging/launch_mantidplot.bat
- Code/Mantid/Build/CMake/Packaging/launch_mantidplot.vbs 37 additions, 0 deletionsCode/Mantid/Build/CMake/Packaging/launch_mantidplot.vbs
- Code/Mantid/Build/CMake/Packaging/mantidpython.bat 32 additions, 0 deletionsCode/Mantid/Build/CMake/Packaging/mantidpython.bat
- Code/Mantid/Build/CMake/WindowsNSIS.cmake 39 additions, 113 deletionsCode/Mantid/Build/CMake/WindowsNSIS.cmake
- Code/Mantid/Build/CMake/WindowsSetup.cmake 15 additions, 0 deletionsCode/Mantid/Build/CMake/WindowsSetup.cmake
- Code/Mantid/Build/class_maker.py 2 additions, 1 deletionCode/Mantid/Build/class_maker.py
- Code/Mantid/Framework/API/CMakeLists.txt 1 addition, 1 deletionCode/Mantid/Framework/API/CMakeLists.txt
- Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmFactory.h 1 addition, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/AlgorithmFactory.h
- Code/Mantid/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h 4 additions, 2 deletions...ntid/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h
- Code/Mantid/Framework/API/src/AlgorithmFactory.cpp 1 addition, 0 deletionsCode/Mantid/Framework/API/src/AlgorithmFactory.cpp
- Code/Mantid/Framework/API/src/DataProcessorAlgorithm.cpp 52 additions, 2 deletionsCode/Mantid/Framework/API/src/DataProcessorAlgorithm.cpp
- Code/Mantid/Framework/API/test/AlgorithmFactoryTest.h 7 additions, 4 deletionsCode/Mantid/Framework/API/test/AlgorithmFactoryTest.h
- Code/Mantid/Framework/API/test/CMakeLists.txt 1 addition, 1 deletionCode/Mantid/Framework/API/test/CMakeLists.txt
- Code/Mantid/Framework/Algorithms/CMakeLists.txt 10 additions, 1 deletionCode/Mantid/Framework/Algorithms/CMakeLists.txt
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/MonitorEfficiencyCorUser.h 57 additions, 0 deletions...lgorithms/inc/MantidAlgorithms/MonitorEfficiencyCorUser.h
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/Qhelper.h 5 additions, 0 deletions...antid/Framework/Algorithms/inc/MantidAlgorithms/Qhelper.h
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SANSCollimationLengthEstimator.h 41 additions, 0 deletions...hms/inc/MantidAlgorithms/SANSCollimationLengthEstimator.h
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolutionByPixel.h 10 additions, 0 deletions...lgorithms/inc/MantidAlgorithms/TOFSANSResolutionByPixel.h
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolutionByPixelCalculator.h 38 additions, 0 deletions...inc/MantidAlgorithms/TOFSANSResolutionByPixelCalculator.h
Loading
Please register or sign in to comment