Skip to content
Snippets Groups Projects
Commit bd9e9ba8 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge remote-tracking branch 'origin/master' into add_requests_library

Conflicts:
	CMakeLists.txt
	MantidPlot/make_package.rb.in
parents 93d55c5b a0524240
No related branches found
No related tags found
No related merge requests found
Showing
with 239 additions and 430 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment