Merge remote-tracking branch 'origin/feature/10015_settings_reset_mechanism' (fe2a80f5) · 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

fe2a80f5

Commit fe2a80f5 authored 10 years ago by Peterson, Peter

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/10015_settings_reset_mechanism'

parents 109123fb ab6b9cbd

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Build/CMake/MantidUtils.cmake 14 additions, 14 deletions

Code/Mantid/Build/CMake/MantidUtils.cmake
Code/Mantid/Framework/PythonInterface/mantid/CMakeLists.txt 4 additions, 4 deletions

Code/Mantid/Framework/PythonInterface/mantid/CMakeLists.txt
Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt 2 additions, 2 deletions

...antid/Framework/PythonInterface/mantid/api/CMakeLists.txt
Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt 2 additions, 2 deletions

.../Framework/PythonInterface/mantid/geometry/CMakeLists.txt
Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt 4 additions, 4 deletions

...id/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
Code/Mantid/Framework/PythonInterface/test/testhelpers/CMakeLists.txt 2 additions, 2 deletions

...Framework/PythonInterface/test/testhelpers/CMakeLists.txt
Code/Mantid/MantidPlot/CMakeLists.txt 31 additions, 14 deletions

Code/Mantid/MantidPlot/CMakeLists.txt
Code/Mantid/MantidPlot/mantid_qt_settings_editor.py 169 additions, 0 deletions

Code/Mantid/MantidPlot/mantid_qt_settings_editor.py
Code/Mantid/MantidPlot/mantid_reset_settings.bat 27 additions, 0 deletions

Code/Mantid/MantidPlot/mantid_reset_settings.bat
Code/Mantid/MantidPlot/mantid_reset_settings.sh 35 additions, 0 deletions

Code/Mantid/MantidPlot/mantid_reset_settings.sh

with 290 additions and 42 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