3 Commits

Author	SHA1	Message	Date
Luke Campagnola	0976991efd	Import from python2_3 for all uses of basestring, cmp, and xrange	2015-05-19 09:29:55 -04:00
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
Luke Campagnola	274c765594	Fixed relativity example	2014-06-14 11:35:00 -06:00