Luke Campagnola c72638ab1b Merge branch 'tommy3001-doc-updates' into develop ... Conflicts: pyqtgraph/graphicsItems/AxisItem.py pyqtgraph/graphicsItems/PlotDataItem.py pyqtgraph/graphicsItems/ROI.py		2014-02-28 21:07:43 -05:00
..
__init__.py	Reorganized directory structure to be more standard	2012-12-25 00:43:31 -05:00
plotConfigTemplate_pyqt.py	rebuild UI files	2013-12-23 10:11:20 -05:00
plotConfigTemplate_pyside.py	rebuild UI files	2013-12-23 10:11:20 -05:00
plotConfigTemplate.ui	copy from acq4	2013-07-03 11:20:49 -04:00
PlotItem.py	Merge branch 'tommy3001-doc-updates' into develop	2014-02-28 21:07:43 -05:00