merge conflict in release notes and error message, re #14788
Showing
- Framework/DataHandling/src/LoadMuonLog.cpp 6 additions, 6 deletionsFramework/DataHandling/src/LoadMuonLog.cpp
- Framework/DataHandling/src/LoadMuonNexus.cpp 12 additions, 9 deletionsFramework/DataHandling/src/LoadMuonNexus.cpp
- Framework/DataHandling/src/LoadMuonNexus1.cpp 3 additions, 3 deletionsFramework/DataHandling/src/LoadMuonNexus1.cpp
- Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h 4 additions, 0 deletionsFramework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
- Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h 1 addition, 0 deletions...eometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h
- Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h 1 addition, 0 deletionsFramework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
- Framework/Geometry/src/Instrument/ObjCompAssembly.cpp 4 additions, 4 deletionsFramework/Geometry/src/Instrument/ObjCompAssembly.cpp
- Framework/Geometry/src/Objects/Object.cpp 15 additions, 15 deletionsFramework/Geometry/src/Objects/Object.cpp
- Framework/Geometry/src/Objects/ShapeFactory.cpp 89 additions, 0 deletionsFramework/Geometry/src/Objects/ShapeFactory.cpp
- Framework/Geometry/src/Rendering/GluGeometryHandler.cpp 6 additions, 5 deletionsFramework/Geometry/src/Rendering/GluGeometryHandler.cpp
- Framework/Geometry/test/ObjCompAssemblyTest.h 1 addition, 1 deletionFramework/Geometry/test/ObjCompAssemblyTest.h
- Framework/Geometry/test/ObjectTest.h 4 additions, 4 deletionsFramework/Geometry/test/ObjectTest.h
- Framework/Geometry/test/ParObjCompAssemblyTest.h 1 addition, 1 deletionFramework/Geometry/test/ParObjCompAssemblyTest.h
- Framework/Geometry/test/ShapeFactoryTest.h 86 additions, 0 deletionsFramework/Geometry/test/ShapeFactoryTest.h
- Framework/Nexus/src/MuonNexusReader.cpp 4 additions, 4 deletionsFramework/Nexus/src/MuonNexusReader.cpp
- Framework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py 13 additions, 8 deletions...ework/PythonInterface/plugins/algorithms/VesuvioTOFFit.py
- Framework/PythonInterface/test/python/plugins/algorithms/VesuvioTOFFitTest.py 13 additions, 4 deletions...rface/test/python/plugins/algorithms/VesuvioTOFFitTest.py
- MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h 10 additions, 3 deletions...stomInterfaces/EnggDiffraction/EnggDiffractionPresenter.h
- MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui 6 additions, 6 deletions...Interfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui
- MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h 31 additions, 15 deletions...stomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
Loading
Please register or sign in to comment