Go to file
Luke Campagnola 2e37d9b12c Merge tag 'pyqtgraph-0.9.10' into core
Conflicts:
	graphicsItems/ViewBox/ViewBox.py
	parametertree/SystemSolver.py
	widgets/SpinBox.py
2015-05-13 13:21:38 -04:00
GraphicsScene Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
canvas Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
console Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
dockarea Merge remote-tracking branch 'pyqtgraph/develop' into core 2014-08-06 10:11:21 -04:00
exporters Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
flowchart Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
graphicsItems Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
imageview Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
metaarray Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
multiprocess Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
opengl Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
parametertree Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
pixmaps Merge branch 'develop' into core 2014-04-15 15:11:19 -04:00
tests Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
util Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
widgets Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
PlotData.py Merge tag 'pyqtgraph-0.9.8' into pyqtgraph-core 2013-12-23 11:15:54 -05:00
Point.py Merge tag 'pyqtgraph-0.9.8' into pyqtgraph-core 2013-12-23 11:15:54 -05:00
Qt.py Merge remote-tracking branch 'pyqtgraph/develop' into core 2014-08-06 10:11:21 -04:00
SRTTransform.py Merge branch 'develop' into pyqtgraph-core 2013-12-23 11:16:39 -05:00
SRTTransform3D.py Merge branch 'develop' into core 2014-04-15 15:11:19 -04:00
SignalProxy.py Merge remote-tracking branch 'pyqtgraph/develop' into core 2014-08-06 10:11:21 -04:00
ThreadsafeTimer.py Merge branch 'develop' into pyqtgraph-core 2013-12-23 11:16:39 -05:00
Transform3D.py Merge branch 'develop' into pyqtgraph-core 2013-12-23 11:16:39 -05:00
Vector.py Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
WidgetGroup.py Reorganized directory structure to be more standard 2012-12-25 00:43:31 -05:00
__init__.py Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
colormap.py Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
configfile.py Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
debug.py Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
exceptionHandling.py Merged numerous updates from acq4: 2014-08-07 08:41:30 -04:00
frozenSupport.py Merge branch 'develop' into core 2014-04-15 15:11:19 -04:00
functions.py Merge tag 'pyqtgraph-0.9.10' into core 2015-05-13 13:21:38 -04:00
graphicsWindows.py Merge branch 'develop' into core 2014-04-15 15:11:19 -04:00
numpy_fix.py Reorganized directory structure to be more standard 2012-12-25 00:43:31 -05:00
ordereddict.py Merge branch 'develop' into core 2014-04-15 15:11:19 -04:00
pgcollections.py Merge tag 'pyqtgraph-0.9.8' into pyqtgraph-core 2013-12-23 11:15:54 -05:00
ptime.py Bugfixes: 2013-01-30 15:51:38 -05:00
python2_3.py Merge branch 'develop' into core 2014-04-15 15:11:19 -04:00
reload.py Fixed print statements for python 3 2013-01-12 14:35:32 -05:00
units.py Reorganized directory structure to be more standard 2012-12-25 00:43:31 -05:00