Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

EO Time Series Viewer
- Activity
- Members
- Environments
- Terraform modules

Snippets Groups Projects

3344fb69

Commit 3344fb69 authored 11 years ago by Luke Campagnola

Downloads
- Plain Diff

merge fixes

parents 09b16bae 671e624f

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

examples/__init__.py 1 addition, 1 deletion

examples/__init__.py
examples/__main__.py 10 additions, 3 deletions

examples/__main__.py
pyqtgraph/__init__.py 2 additions, 1 deletion

pyqtgraph/__init__.py
pyqtgraph/graphicsItems/AxisItem.py 18 additions, 3 deletions

pyqtgraph/graphicsItems/AxisItem.py
pyqtgraph/graphicsItems/LegendItem.py 30 additions, 0 deletions

pyqtgraph/graphicsItems/LegendItem.py
pyqtgraph/graphicsItems/PlotItem/PlotItem.py 7 additions, 5 deletions

pyqtgraph/graphicsItems/PlotItem/PlotItem.py
pyqtgraph/graphicsItems/ROI.py 1 addition, 1 deletion

pyqtgraph/graphicsItems/ROI.py
pyqtgraph/multiprocess/parallelizer.py 1 addition, 1 deletion

pyqtgraph/multiprocess/parallelizer.py
pyqtgraph/multiprocess/remoteproxy.py 1 addition, 1 deletion

pyqtgraph/multiprocess/remoteproxy.py

with 71 additions and 16 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 sign in to comment

Impressum | Datenschutzerklärung