Skip to content
Snippets Groups Projects
Commit 13497200 authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

Merge branch 'PlotOnColorMap' into develop 

Conflicts:
	GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
	GUI/coregui/coregui.qrc
parents d373aa3a 3b9c5385
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 472 additions and 4 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