Luke Campagnola 1fe5976e19 Merge branch 'pyqt5' into develop ...

Conflicts:
	examples/parametertree.py
	pyqtgraph/Qt.py
	pyqtgraph/graphicsItems/FillBetweenItem.py
	pyqtgraph/graphicsItems/InfiniteLine.py
	pyqtgraph/imageview/ImageView.py

2015-02-28 11:46:41 -05:00

..

presets

Fixed relativity example

2014-06-14 11:35:00 -06:00

__init__.py

Merge branch 'pyqt5' into develop

2015-02-28 11:46:41 -05:00

relativity.py

Merge branch 'pyqt5' into develop

2015-02-28 11:46:41 -05:00