Merge branch 'master' into 7817_tosca_sample_position_correction
Re #7817
No related branches found
No related tags found
Showing
- CONTRIBUTING.md 0 additions, 1 deletionCONTRIBUTING.md
- Code/Mantid/Build/CMake/CommonSetup.cmake 7 additions, 6 deletionsCode/Mantid/Build/CMake/CommonSetup.cmake
- Code/Mantid/Build/CMake/FindPyQt.py 2 additions, 2 deletionsCode/Mantid/Build/CMake/FindPyQt.py
- Code/Mantid/Build/CMake/FindPyQt4.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/FindPyQt4.cmake
- Code/Mantid/Build/CMake/Packaging/mantidpython.in 2 additions, 2 deletionsCode/Mantid/Build/CMake/Packaging/mantidpython.in
- Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_post_install.sh.in 8 additions, 0 deletions.../Build/CMake/Packaging/rpm/scripts/rpm_post_install.sh.in
- Code/Mantid/Build/CMake/Packaging/rpm/scripts/rpm_pre_uninstall.sh.in 10 additions, 1 deletion...Build/CMake/Packaging/rpm/scripts/rpm_pre_uninstall.sh.in
- Code/Mantid/Build/CMake/ParaViewSetup.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/ParaViewSetup.cmake
- Code/Mantid/Build/CMake/hdf5-config.cmake 2 additions, 2 deletionsCode/Mantid/Build/CMake/hdf5-config.cmake
- Code/Mantid/Build/Jenkins/buildscript 2 additions, 2 deletionsCode/Mantid/Build/Jenkins/buildscript
- Code/Mantid/Build/Jenkins/buildscript.bat 1 addition, 2 deletionsCode/Mantid/Build/Jenkins/buildscript.bat
- Code/Mantid/Build/Jenkins/doctests 1 addition, 1 deletionCode/Mantid/Build/Jenkins/doctests
- Code/Mantid/Build/Jenkins/doctests.bat 2 additions, 2 deletionsCode/Mantid/Build/Jenkins/doctests.bat
- Code/Mantid/Build/Jenkins/systemtests.bat 1 addition, 0 deletionsCode/Mantid/Build/Jenkins/systemtests.bat
- Code/Mantid/Build/class_maker.py 2 additions, 0 deletionsCode/Mantid/Build/class_maker.py
- Code/Mantid/Build/dev-packages/deb/mantid-developer/README 2 additions, 2 deletionsCode/Mantid/Build/dev-packages/deb/mantid-developer/README
- Code/Mantid/Build/dev-packages/deb/mantid-developer/mantid-developer-1.2.5/DEBIAN/control 13 additions, 0 deletions...eb/mantid-developer/mantid-developer-1.2.5/DEBIAN/control
- Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec 8 additions, 3 deletions...d/dev-packages/rpm/mantid-developer/mantid-developer.spec
- Code/Mantid/Framework/API/CMakeLists.txt 1 addition, 0 deletionsCode/Mantid/Framework/API/CMakeLists.txt
- Code/Mantid/Framework/API/inc/MantidAPI/CatalogManager.h 3 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/CatalogManager.h
Loading
Please register or sign in to comment