Skip to content
Snippets Groups Projects
Commit 2eaba836 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony
Browse files

Merge remote-tracking branch 'origin/master' into feature/9252_plot_axes_formatting 

Conflicts:
	Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h
	Code/Mantid/MantidQt/API/CMakeLists.txt
Refs #9252
parents fd688b21 6b79121a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 334 additions and 78 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment