Merge branch 'master' into feature/10368_apply_corrections_preview_plot
Conflicts: Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp Refs #10368
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/Build/CMake/FindTcmalloc.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/FindTcmalloc.cmake
- Code/Mantid/Build/CMake/UseSystemQt4.cmake 7 additions, 2 deletionsCode/Mantid/Build/CMake/UseSystemQt4.cmake
- Code/Mantid/Build/class_maker.py 3 additions, 1 deletionCode/Mantid/Build/class_maker.py
- 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/Column.h 10 additions, 9 deletionsCode/Mantid/Framework/API/inc/MantidAPI/Column.h
- Code/Mantid/Framework/API/inc/MantidAPI/IMDNode.h 1 addition, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IMDNode.h
- 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/Sample.h 12 additions, 17 deletionsCode/Mantid/Framework/API/inc/MantidAPI/Sample.h
- Code/Mantid/Framework/API/inc/MantidAPI/SampleEnvironment.h 30 additions, 28 deletionsCode/Mantid/Framework/API/inc/MantidAPI/SampleEnvironment.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/ExperimentInfo.cpp 32 additions, 27 deletionsCode/Mantid/Framework/API/src/ExperimentInfo.cpp
- Code/Mantid/Framework/API/src/MatrixWorkspace.cpp 287 additions, 3 deletionsCode/Mantid/Framework/API/src/MatrixWorkspace.cpp
- Code/Mantid/Framework/API/src/MemoryManager.cpp 1 addition, 1 deletionCode/Mantid/Framework/API/src/MemoryManager.cpp
- Code/Mantid/Framework/API/src/Sample.cpp 24 additions, 44 deletionsCode/Mantid/Framework/API/src/Sample.cpp
- Code/Mantid/Framework/API/src/SampleEnvironment.cpp 35 additions, 64 deletionsCode/Mantid/Framework/API/src/SampleEnvironment.cpp
- Code/Mantid/Framework/API/src/SampleShapeValidator.cpp 50 additions, 0 deletionsCode/Mantid/Framework/API/src/SampleShapeValidator.cpp
Loading
Please register or sign in to comment