2 Commits

Author	SHA1	Message	Date
Luke Campagnola	c7f4a8fd39	Merge branch 'develop' into core	2014-04-15 15:11:19 -04:00
Luke Campagnola	f613d33c49	Merge branch 'develop' into pyqtgraph-core	2014-01-24 10:50:50 -05:00