Merge remote-tracking branch 'origin/master' into feature/9639_doc_tests_inside_ctest
Conflicts: Code/Mantid/Build/Jenkins/buildscript Code/Mantid/docs/CMakeLists.txt Code/Mantid/docs/runsphinx.py.in
No related branches found
No related tags found
Showing
- Code/Mantid/Build/CMake/CPackLinuxSetup.cmake 7 additions, 7 deletionsCode/Mantid/Build/CMake/CPackLinuxSetup.cmake
- Code/Mantid/Build/CMake/CommonSetup.cmake 5 additions, 0 deletionsCode/Mantid/Build/CMake/CommonSetup.cmake
- Code/Mantid/Build/CMake/DarwinSetup.cmake 30 additions, 15 deletionsCode/Mantid/Build/CMake/DarwinSetup.cmake
- Code/Mantid/Build/CMake/FindPylint.cmake 40 additions, 0 deletionsCode/Mantid/Build/CMake/FindPylint.cmake
- Code/Mantid/Build/CMake/LinuxSetup.cmake 3 additions, 3 deletionsCode/Mantid/Build/CMake/LinuxSetup.cmake
- Code/Mantid/Build/CMake/PylintSetup.cmake 50 additions, 0 deletionsCode/Mantid/Build/CMake/PylintSetup.cmake
- Code/Mantid/Build/CMake/UseSystemQt4.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/UseSystemQt4.cmake
- Code/Mantid/Build/CMake/VersionNumber.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/VersionNumber.cmake
- Code/Mantid/Build/CMake/WindowsNSIS.cmake 0 additions, 3 deletionsCode/Mantid/Build/CMake/WindowsNSIS.cmake
- Code/Mantid/Build/Jenkins/buildscript 25 additions, 4 deletionsCode/Mantid/Build/Jenkins/buildscript
- Code/Mantid/Build/Jenkins/buildscript.bat 22 additions, 6 deletionsCode/Mantid/Build/Jenkins/buildscript.bat
- Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-el6.spec 1 addition, 2 deletions...v-packages/rpm/mantid-developer/mantid-developer-el6.spec
- Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f19.spec 1 addition, 2 deletions...v-packages/rpm/mantid-developer/mantid-developer-f19.spec
- Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer-f20.spec 1 addition, 2 deletions...v-packages/rpm/mantid-developer/mantid-developer-f20.spec
- Code/Mantid/CMakeLists.txt 14 additions, 16 deletionsCode/Mantid/CMakeLists.txt
- Code/Mantid/Framework/API/CMakeLists.txt 2 additions, 1 deletionCode/Mantid/Framework/API/CMakeLists.txt
- Code/Mantid/Framework/API/inc/MantidAPI/Algorithm.h 2 additions, 2 deletionsCode/Mantid/Framework/API/inc/MantidAPI/Algorithm.h
- Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmHistory.h 4 additions, 4 deletionsCode/Mantid/Framework/API/inc/MantidAPI/AlgorithmHistory.h
- Code/Mantid/Framework/API/inc/MantidAPI/CatalogManager.h 2 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/CatalogManager.h
- Code/Mantid/Framework/API/inc/MantidAPI/CatalogSession.h 1 addition, 1 deletionCode/Mantid/Framework/API/inc/MantidAPI/CatalogSession.h
Loading
Please register or sign in to comment