Merge branch 'master' into refl_parameters
Showing
- Code/Mantid/Build/CMake/CommonSetup.cmake 10 additions, 1 deletionCode/Mantid/Build/CMake/CommonSetup.cmake
- Code/Mantid/Build/CMake/FindJsonCPP.cmake 7 additions, 1 deletionCode/Mantid/Build/CMake/FindJsonCPP.cmake
- Code/Mantid/Build/CMake/FindOpenCascade.cmake 21 additions, 10 deletionsCode/Mantid/Build/CMake/FindOpenCascade.cmake
- Code/Mantid/Build/CMake/FindQwt.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/FindQwt.cmake
- Code/Mantid/Build/CMake/LinuxPackageScripts.cmake 14 additions, 15 deletionsCode/Mantid/Build/CMake/LinuxPackageScripts.cmake
- Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in 4 additions, 2 deletionsCode/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in
- Code/Mantid/Build/CMake/Packaging/mantidpython.in 34 additions, 0 deletionsCode/Mantid/Build/CMake/Packaging/mantidpython.in
- Code/Mantid/Build/Jenkins/buildscript 5 additions, 1 deletionCode/Mantid/Build/Jenkins/buildscript
- Code/Mantid/Build/Jenkins/buildscript.bat 1 addition, 1 deletionCode/Mantid/Build/Jenkins/buildscript.bat
- Code/Mantid/CMakeLists.txt 1 addition, 0 deletionsCode/Mantid/CMakeLists.txt
- Code/Mantid/Framework/API/inc/MantidAPI/FunctionDomain1D.h 2 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/FunctionDomain1D.h
- Code/Mantid/Framework/API/inc/MantidAPI/FunctionValues.h 3 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/FunctionValues.h
- Code/Mantid/Framework/API/inc/MantidAPI/IMDEventWorkspace.h 0 additions, 5 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IMDEventWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h 1 addition, 1 deletionCode/Mantid/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h 3 additions, 4 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/IPeaksWorkspace.h 7 additions, 10 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IPeaksWorkspace.h
- Code/Mantid/Framework/API/src/FunctionDomain1D.cpp 10 additions, 0 deletionsCode/Mantid/Framework/API/src/FunctionDomain1D.cpp
- Code/Mantid/Framework/Algorithms/src/Stitch1DMany.cpp 4 additions, 4 deletionsCode/Mantid/Framework/Algorithms/src/Stitch1DMany.cpp
- Code/Mantid/Framework/CurveFitting/CMakeLists.txt 3 additions, 0 deletionsCode/Mantid/Framework/CurveFitting/CMakeLists.txt
- Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/EstimatePeakErrors.h 50 additions, 0 deletions.../CurveFitting/inc/MantidCurveFitting/EstimatePeakErrors.h
Loading
Please register or sign in to comment