Merge remote-tracking branch 'origin/master' into sum_characterizations (ff95ffa0) · Commits · mantidproject / mantid

Commit ff95ffa0 authored 9 years ago by Peterson, Peter

Browse files

Merge remote-tracking branch 'origin/master' into sum_characterizations

parents 9e6d704c 1be3115c

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Build/CMake/Packaging/launch_mantidplot.bat 35 additions, 0 deletions

Code/Mantid/Build/CMake/Packaging/launch_mantidplot.bat
Code/Mantid/Build/CMake/Packaging/launch_mantidplot.vbs 37 additions, 0 deletions

Code/Mantid/Build/CMake/Packaging/launch_mantidplot.vbs
Code/Mantid/Build/CMake/Packaging/mantidpython.bat 32 additions, 0 deletions

Code/Mantid/Build/CMake/Packaging/mantidpython.bat
Code/Mantid/Build/CMake/WindowsNSIS.cmake 36 additions, 111 deletions

Code/Mantid/Build/CMake/WindowsNSIS.cmake
Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmFactory.h 1 addition, 0 deletions

Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmFactory.h
Code/Mantid/Framework/API/src/AlgorithmFactory.cpp 1 addition, 0 deletions

Code/Mantid/Framework/API/src/AlgorithmFactory.cpp
Code/Mantid/Framework/API/test/AlgorithmFactoryTest.h 7 additions, 4 deletions

Code/Mantid/Framework/API/test/AlgorithmFactoryTest.h
Code/Mantid/Framework/CMakeLists.txt 2 additions, 1 deletion

Code/Mantid/Framework/CMakeLists.txt
Code/Mantid/Framework/DataObjects/CMakeLists.txt 1 addition, 6 deletions

Code/Mantid/Framework/DataObjects/CMakeLists.txt
Code/Mantid/Framework/PostInstall/CMakeLists.txt 1 addition, 1 deletion

Code/Mantid/Framework/PostInstall/CMakeLists.txt
Code/Mantid/Framework/PythonInterface/plugins/algorithms/ApplyNegMuCorrection.py 96 additions, 0 deletions

...ythonInterface/plugins/algorithms/ApplyNegMuCorrection.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/CollectHB3AExperimentInfo.py 1 addition, 1 deletion

...Interface/plugins/algorithms/CollectHB3AExperimentInfo.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection.py 9 additions, 9 deletions

...face/plugins/algorithms/CylinderPaalmanPingsCorrection.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/CylinderPaalmanPingsCorrection2.py 12 additions, 16 deletions

...ace/plugins/algorithms/CylinderPaalmanPingsCorrection2.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/EnggVanadiumCorrections.py 2 additions, 2 deletions

...onInterface/plugins/algorithms/EnggVanadiumCorrections.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/GetNuMegMuonicXRD.py 10 additions, 12 deletions

...k/PythonInterface/plugins/algorithms/GetNuMegMuonicXRD.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/MuscatSofQW.py 1 addition, 2 deletions

...amework/PythonInterface/plugins/algorithms/MuscatSofQW.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py 1 addition, 1 deletion

...ns/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py 11 additions, 11 deletions

...gorithms/WorkflowAlgorithms/OSIRISDiffractionReduction.py
Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt 2 additions, 0 deletions

Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt

with 298 additions and 177 deletions

Please register or to comment