Merge remote-tracking branch 'origin/feature/8321_icat_asynchronous_algorithms'
Conflicts: Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch2.h Refs #8321
No related branches found
No related tags found
Showing
- Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Helper.h 2 additions, 2 deletions.../Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Helper.h
- Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp 3 additions, 4 deletionsCode/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
- Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp 2 additions, 1 deletionCode/Mantid/Framework/Kernel/src/CatalogInfo.cpp
- Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatHelper.h 8 additions, 6 deletions...idQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatHelper.h
- Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch2.h 11 additions, 11 deletions...dQt/MantidWidgets/inc/MantidQtMantidWidgets/ICatSearch2.h
- Code/Mantid/MantidQt/MantidWidgets/src/ICatHelper.cpp 29 additions, 30 deletionsCode/Mantid/MantidQt/MantidWidgets/src/ICatHelper.cpp
- Code/Mantid/MantidQt/MantidWidgets/src/ICatSearch2.cpp 18 additions, 17 deletionsCode/Mantid/MantidQt/MantidWidgets/src/ICatSearch2.cpp
Loading
Please register or sign in to comment