Skip to content
Commit 722dd770 authored by Stefan Gerlach's avatar Stefan Gerlach
Browse files

Merge branch 'master' into frameworks 

Conflicts:
	src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
	src/commonfrontend/worksheet/WorksheetView.cpp
parents a4cb5de1 979f7d6a
Hide whitespace changes
Inline Side-by-side
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