Merge remote-tracking branch 'origin/master' into bugfix/7711_elwin_temperature_fix
No related branches found
No related tags found
Showing
- .gitattributes 4 additions, 3 deletions.gitattributes
- Code/Mantid/Build/CMake/CommonSetup.cmake 56 additions, 133 deletionsCode/Mantid/Build/CMake/CommonSetup.cmake
- Code/Mantid/Build/CMake/CppCheckSetup.cmake 132 additions, 0 deletionsCode/Mantid/Build/CMake/CppCheckSetup.cmake
- Code/Mantid/Build/CMake/FindOpenCascade.cmake 1 addition, 0 deletionsCode/Mantid/Build/CMake/FindOpenCascade.cmake
- Code/Mantid/Build/CMake/PatchVersionNumber.cmake.in 1 addition, 1 deletionCode/Mantid/Build/CMake/PatchVersionNumber.cmake.in
- Code/Mantid/Build/CMake/WindowsNSIS.cmake 1 addition, 7 deletionsCode/Mantid/Build/CMake/WindowsNSIS.cmake
- Code/Mantid/Build/checkin_except.py 0 additions, 117 deletionsCode/Mantid/Build/checkin_except.py
- Code/Mantid/Build/cmakelists_utils.py 1 addition, 1 deletionCode/Mantid/Build/cmakelists_utils.py
- Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec 0 additions, 0 deletions...v-packages/rpm/mantid-developer/mantid-developer-el6.spec
- Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec 98 additions, 0 deletions...v-packages/rpm/mantid-developer/mantid-developer-f19.spec
- Code/Mantid/Build/svn_new_files.py 0 additions, 72 deletionsCode/Mantid/Build/svn_new_files.py
- Code/Mantid/CMakeLists.txt 0 additions, 6 deletionsCode/Mantid/CMakeLists.txt
- Code/Mantid/Framework/API/CMakeLists.txt 5 additions, 2 deletionsCode/Mantid/Framework/API/CMakeLists.txt
- Code/Mantid/Framework/API/inc/MantidAPI/AnalysisDataService.h 3 additions, 4 deletions.../Mantid/Framework/API/inc/MantidAPI/AnalysisDataService.h
- Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h 14 additions, 7 deletionsCode/Mantid/Framework/API/inc/MantidAPI/BoxController.h
- Code/Mantid/Framework/API/inc/MantidAPI/Column.h 5 additions, 16 deletionsCode/Mantid/Framework/API/inc/MantidAPI/Column.h
- Code/Mantid/Framework/API/inc/MantidAPI/ColumnFactory.h 3 additions, 22 deletionsCode/Mantid/Framework/API/inc/MantidAPI/ColumnFactory.h
- Code/Mantid/Framework/API/inc/MantidAPI/ExperimentInfo.h 16 additions, 8 deletionsCode/Mantid/Framework/API/inc/MantidAPI/ExperimentInfo.h
- Code/Mantid/Framework/API/inc/MantidAPI/IEventWorkspace.h 1 addition, 2 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IEventWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/IFunction.h 20 additions, 3 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IFunction.h
Loading
Please register or sign in to comment