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

Reorganized directory structure to be more standard

2012-12-25 00:43:31 -05:00

Canvas.py

Squashed commit of the following:

2014-08-07 09:03:26 -04:00

CanvasItem.py

Merge branch 'tommy3001-doc-updates' into develop

2014-02-28 21:07:43 -05:00

CanvasManager.py

flowchart, canvas

2013-12-23 10:01:20 -05:00

CanvasTemplate_pyqt5.py

Generated qt5 template files

2014-03-29 06:57:13 -04:00

CanvasTemplate_pyqt.py

Squashed commit of the following:

2014-08-07 09:03:26 -04:00

CanvasTemplate_pyside.py

rebuild UI files

2013-12-23 10:11:20 -05:00

CanvasTemplate.ui

Squashed commit of the following:

2014-08-07 09:03:26 -04:00

TransformGuiTemplate_pyqt5.py

Generated qt5 template files

2014-03-29 06:57:13 -04:00

TransformGuiTemplate_pyqt.py

rebuild UI files

2013-12-23 10:11:20 -05:00

TransformGuiTemplate_pyside.py

rebuild UI files

2013-12-23 10:11:20 -05:00

TransformGuiTemplate.ui

Reorganized directory structure to be more standard

2012-12-25 00:43:31 -05:00