Revert "Revert "Merge branch 'master' into PascalPeakFinding""
This reverts commit dd712de8.
Showing
- Code/Mantid/Build/CMake/GNUSetup.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/GNUSetup.cmake
- Code/Mantid/Build/python_export_maker.py 1 addition, 0 deletionsCode/Mantid/Build/python_export_maker.py
- Code/Mantid/Framework/API/inc/MantidAPI/FileProperty.h 7 additions, 1 deletionCode/Mantid/Framework/API/inc/MantidAPI/FileProperty.h
- Code/Mantid/Framework/API/inc/MantidAPI/MultipleFileProperty.h 4 additions, 5 deletions...Mantid/Framework/API/inc/MantidAPI/MultipleFileProperty.h
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing2.h 3 additions, 4 deletions...k/Algorithms/inc/MantidAlgorithms/DiffractionFocussing2.h
- Code/Mantid/Framework/Algorithms/src/DiffractionFocussing2.cpp 3 additions, 3 deletions...Mantid/Framework/Algorithms/src/DiffractionFocussing2.cpp
- Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp 28 additions, 3 deletionsCode/Mantid/Framework/DataHandling/src/SaveGSS.cpp
- Code/Mantid/Framework/Kernel/inc/MantidKernel/MaskedProperty.h 4 additions, 0 deletions...Mantid/Framework/Kernel/inc/MantidKernel/MaskedProperty.h
- Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py 2 additions, 1 deletion...ramework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py
- Code/Mantid/Framework/PythonInterface/CMakeLists.txt 1 addition, 0 deletionsCode/Mantid/Framework/PythonInterface/CMakeLists.txt
- Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt 1 addition, 0 deletions...id/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
- Code/Mantid/Framework/PythonInterface/mantid/kernel/__init__.py 5 additions, 0 deletions...antid/Framework/PythonInterface/mantid/kernel/__init__.py
- Code/Mantid/Framework/PythonInterface/mantid/kernel/src/ConfigService.cpp 39 additions, 0 deletions...ework/PythonInterface/mantid/kernel/src/ConfigService.cpp
- Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Logger.cpp 2 additions, 2 deletions...id/Framework/PythonInterface/mantid/kernel/src/Logger.cpp
- Code/Mantid/Framework/PythonInterface/mantid/kernel/src/StlContainers.cpp 1 addition, 1 deletion...ework/PythonInterface/mantid/kernel/src/StlContainers.cpp
- Code/Mantid/Framework/PythonInterface/test/python/ConfigServiceTest.py 86 additions, 0 deletions...ramework/PythonInterface/test/python/ConfigServiceTest.py
- Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp 9 additions, 0 deletions...t/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp
- Code/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.cpp 13 additions, 0 deletionsCode/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.cpp
- Code/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.h 3 additions, 0 deletionsCode/Mantid/MantidPlot/src/Mantid/MantidMatrixCurve.h
- Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui 877 additions, 870 deletions...nterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
Loading
Please register or sign in to comment