Skip to content
Snippets Groups Projects
Commit c72638ab authored by Luke Campagnola's avatar Luke Campagnola
Browse files

Merge branch 'tommy3001-doc-updates' into develop

Conflicts:
	pyqtgraph/graphicsItems/AxisItem.py
	pyqtgraph/graphicsItems/PlotDataItem.py
	pyqtgraph/graphicsItems/ROI.py
parents 912f1f13 da4bb3df
No related branches found
No related tags found
No related merge requests found
Showing
with 318 additions and 309 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