Merge remote-tracking branch 'origin/feature/7403_remove_supported.facilities' (2b0e40e6) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

2b0e40e6

Commit 2b0e40e6 authored 11 years ago by Gigg, Martyn Anthony

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/7403_remove_supported.facilities'

parents 364fbc43 4d1224e8

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h 4 additions, 0 deletions

.../Mantid/Framework/Kernel/inc/MantidKernel/ConfigService.h
Code/Mantid/Framework/Kernel/src/ConfigService.cpp 24 additions, 1 deletion

Code/Mantid/Framework/Kernel/src/ConfigService.cpp
Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp 3 additions, 11 deletions

Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp
Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h 17 additions, 0 deletions

Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
Code/Mantid/Framework/Kernel/test/MultiFileNameParserTest.h 0 additions, 1 deletion

Code/Mantid/Framework/Kernel/test/MultiFileNameParserTest.h
Code/Mantid/Framework/Properties/Mantid.properties.template 0 additions, 3 deletions

Code/Mantid/Framework/Properties/Mantid.properties.template
Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp 9 additions, 0 deletions

...thonInterface/mantid/kernel/src/Exports/ConfigService.cpp
Code/Mantid/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py 14 additions, 1 deletion

...nInterface/test/python/mantid/kernel/ConfigServiceTest.py
Code/Mantid/MantidPlot/src/ConfigDialog.cpp 6 additions, 4 deletions

Code/Mantid/MantidPlot/src/ConfigDialog.cpp
Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.cpp 3 additions, 3 deletions

Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.cpp

with 80 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment