2 Commits

Author	SHA1	Message	Date
Luke Campagnola	c7f4a8fd39	Merge branch 'develop' into core	2014-04-15 15:11:19 -04:00
Luke Campagnola	1dae1def22	Merge branch 'develop' into pyqtgraph-core	2013-12-23 11:16:39 -05:00