Re #17816 Merge conflict fix (properly) (a4d167a7) · Commits · mantidproject / mantid

Commit a4d167a7 authored 8 years ago by Pranav Bahuguna

Browse files

Re #17816 Merge conflict fix (properly)

parents c0fc537e d8a0449b

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h 2 additions, 0 deletions

...work/DataHandling/inc/MantidDataHandling/AsciiPointBase.h
Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h 2 additions, 2 deletions

...work/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h
Framework/DataHandling/src/AsciiPointBase.cpp 12 additions, 7 deletions

Framework/DataHandling/src/AsciiPointBase.cpp
Framework/DataHandling/src/SaveILLCosmosAscii.cpp 1 addition, 0 deletions

Framework/DataHandling/src/SaveILLCosmosAscii.cpp
Framework/DataHandling/src/SaveReflCustomAscii.cpp 1 addition, 0 deletions

Framework/DataHandling/src/SaveReflCustomAscii.cpp
Framework/DataHandling/src/SaveReflThreeColumnAscii.cpp 1 addition, 0 deletions

Framework/DataHandling/src/SaveReflThreeColumnAscii.cpp
MantidQt/CustomInterfaces/CMakeLists.txt 14 additions, 7 deletions

MantidQt/CustomInterfaces/CMakeLists.txt
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h 4 additions, 25 deletions

...antidQtCustomInterfaces/Tomography/ITomographyIfaceView.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoSystemSettings.h 3 additions, 0 deletions

.../MantidQtCustomInterfaces/Tomography/TomoSystemSettings.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h 0 additions, 97 deletions

...antidQtCustomInterfaces/Tomography/TomoToolConfigDialog.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialogAstra.h 38 additions, 0 deletions

...QtCustomInterfaces/Tomography/TomoToolConfigDialogAstra.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialogBase.h 153 additions, 0 deletions

...dQtCustomInterfaces/Tomography/TomoToolConfigDialogBase.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialogCustom.h 37 additions, 0 deletions

...tCustomInterfaces/Tomography/TomoToolConfigDialogCustom.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialogSavu.h 71 additions, 0 deletions

...dQtCustomInterfaces/Tomography/TomoToolConfigDialogSavu.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomoToolConfigDialogTomoPy.h 37 additions, 0 deletions

...tCustomInterfaces/Tomography/TomoToolConfigDialogTomoPy.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceModel.h 109 additions, 50 deletions

...antidQtCustomInterfaces/Tomography/TomographyIfaceModel.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h 37 additions, 3 deletions

...dQtCustomInterfaces/Tomography/TomographyIfacePresenter.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h 7 additions, 88 deletions

...dQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h 1 addition, 3 deletions

...nc/MantidQtCustomInterfaces/Tomography/ToolConfigTomoPy.h
MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp 3 additions, 0 deletions

MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp

with 533 additions and 282 deletions

Please register or to comment