4 Commits

Author	SHA1	Message	Date
Luke Campagnola	1dae1def22	Merge branch 'develop' into pyqtgraph-core	2013-12-23 11:16:39 -05:00
Luke Campagnola	757dc50447	Merge tag 'pyqtgraph-0.9.8' into pyqtgraph-core	2013-12-23 11:15:54 -05:00
Luke Campagnola	025f2e5575	merged many new features from ACQ4	2013-02-10 17:45:16 -05:00
Luke Campagnola	17409bc9a6	Merge new fixes and features from acq4	2013-02-10 14:10:30 -05:00