Skip to content
Snippets Groups Projects
Select Git revision
  • 39107_mantid_fit_unweighted_least_squares
  • get-interaction-vol-com-alg
  • create-pole-figure-table-alg
  • set-goniometer-optional-matrix-string
  • main default
  • ewm10070-AnyShapeAbsorption-uses-beam-description
  • replace-hard-coded-path-ornl-next
  • deprecate-UnwrapMonitor
  • 39146_remove_nested_boost_optional
  • 39205-ornl-next
  • fix_refl_create_trans_leak
  • 35918_quickbayes_from_conda
  • ewm9985-deprecate-UnwrapMonitor
  • backmari_loadlotsoffiles_loadsnsspec
  • gsl-2-8
  • remove_gsl_error_workaround
  • nested_bool_optional_removal
  • add-classical-to-vesuvio-peak-prediction
  • allow-eng-diff-fit-in-dspac
  • casting_error_generate_grouping_powder
  • v6.12.20250416.2206
  • v6.12.0.2rc2
  • v6.12.20250414.2204
  • v6.12.0.2rc1
  • v6.12.20250410.2113
  • v6.12.20250408.1735
  • v6.12.20250407.1614
  • v6.12.20250402.2323
  • v6.12.20250401.2327
  • v6.12.20250324.1657
  • v6.12.0.1
  • v6.12.20250321.0927
  • v6.12.20250320.1713
  • v6.12.0.1rc3
  • v6.12.20250314.1925
  • v6.12.0.1rc2
  • v6.12.20250313.1634
  • v6.12.20250312.2000
  • v6.12.0.1rc1
  • v6.12.20250310.1545
40 results
Blame Permalink
  • Matthew D Jones's avatar
    3ef8d1f5
    Re #15411 merge master and fix conflicts · 3ef8d1f5
    Matthew D Jones authored 
    Conflicts:
	Framework/API/inc/MantidAPI/IMDWorkspace.h
	Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
	Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc
	Framework/DataObjects/src/MDHistoWorkspace.cpp
	Framework/DataObjects/test/MDEventWorkspaceTest.h
	Framework/DataObjects/test/MDHistoWorkspaceTest.h
	Vates/VatesAPI/test/MockObjects.h
    3ef8d1f5
    History
    Re #15411 merge master and fix conflicts
    Matthew D Jones authored 
    Conflicts:
	Framework/API/inc/MantidAPI/IMDWorkspace.h
	Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
	Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc
	Framework/DataObjects/src/MDHistoWorkspace.cpp
	Framework/DataObjects/test/MDEventWorkspaceTest.h
	Framework/DataObjects/test/MDHistoWorkspaceTest.h
	Vates/VatesAPI/test/MockObjects.h
Code owners
Assign users and groups as approvers for specific file changes. Learn more.