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
..
__init__.py	Python 3 fixes for new demos	2014-05-22 01:30:15 -04:00
pyoptic.py	Merge branch 'pyqt5' into develop	2015-02-28 11:46:41 -05:00
schott_glasses.csv.gz	Added new demos:	2014-05-22 01:22:12 -04:00