Merge branch 'master' of github.com:mantidproject/mantid (106ef298) · Commits · mantidproject / mantid

Commit 106ef298 authored 13 years ago by Janik Zikovsky

Browse files

Merge branch 'master' of github.com:mantidproject/mantid

parents e58fd06e 8dc01037

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/Algorithms/src/CropWorkspace.cpp 12 additions, 0 deletions

Code/Mantid/Framework/Algorithms/src/CropWorkspace.cpp
Code/Mantid/Framework/Algorithms/src/ExtractSingleSpectrum.cpp 12 additions, 42 deletions

...Mantid/Framework/Algorithms/src/ExtractSingleSpectrum.cpp
Code/Mantid/Framework/Algorithms/test/ExtractSingleSpectrumTest.h 76 additions, 41 deletions

...tid/Framework/Algorithms/test/ExtractSingleSpectrumTest.h
Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt 0 additions, 52 deletions

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BoxFunctionBuilder.h 0 additions, 72 deletions

.../MDAlgorithms/inc/MantidMDAlgorithms/BoxFunctionBuilder.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BoxImplicitFunction.h 0 additions, 109 deletions

...MDAlgorithms/inc/MantidMDAlgorithms/BoxImplicitFunction.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BoxImplicitFunctionParser.h 0 additions, 85 deletions

...rithms/inc/MantidMDAlgorithms/BoxImplicitFunctionParser.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BoxInterpreter.h 0 additions, 73 deletions

...work/MDAlgorithms/inc/MantidMDAlgorithms/BoxInterpreter.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/DepthParameter.h 0 additions, 44 deletions

...work/MDAlgorithms/inc/MantidMDAlgorithms/DepthParameter.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/HeightParameter.h 0 additions, 44 deletions

...ork/MDAlgorithms/inc/MantidMDAlgorithms/HeightParameter.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDParameterParserDeclarations.h 0 additions, 24 deletions

...ms/inc/MantidMDAlgorithms/MDParameterParserDeclarations.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/NormalParameter.h 0 additions, 81 deletions

...ork/MDAlgorithms/inc/MantidMDAlgorithms/NormalParameter.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OriginParameter.h 0 additions, 45 deletions

...ork/MDAlgorithms/inc/MantidMDAlgorithms/OriginParameter.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PerpendicularParameter.h 0 additions, 42 deletions

...lgorithms/inc/MantidMDAlgorithms/PerpendicularParameter.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PlaneFunctionBuilder.h 0 additions, 67 deletions

...DAlgorithms/inc/MantidMDAlgorithms/PlaneFunctionBuilder.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PlaneImplicitFunction.h 0 additions, 93 deletions

...Algorithms/inc/MantidMDAlgorithms/PlaneImplicitFunction.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PlaneImplicitFunctionParser.h 0 additions, 65 deletions

...thms/inc/MantidMDAlgorithms/PlaneImplicitFunctionParser.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PlaneInterpreter.h 0 additions, 78 deletions

...rk/MDAlgorithms/inc/MantidMDAlgorithms/PlaneInterpreter.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UpParameter.h 0 additions, 43 deletions

...amework/MDAlgorithms/inc/MantidMDAlgorithms/UpParameter.h
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h 8 additions, 8 deletions

...gorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h

with 108 additions and 1108 deletions

Please register or to comment