Merge branch 'master' into feature/9843_integrate_sysmonitor_widget (9ea4976d) · Commits · mantidproject / mantid

Commit 9ea4976d authored 10 years ago by Martyn Gigg

Merge branch 'master' into feature/9843_integrate_sysmonitor_widget

Conflicts:
	Code/Mantid/MantidPlot/CMakeLists.txt
	Code/Mantid/MantidPlot/src/ApplicationWindow.h
	Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp
	Code/Mantid/MantidPlot/src/Mantid/MantidUI.h
Refs #9843

parents 68c021cc 65ff2f3d

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 241 additions and 74 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment