Commit Graph

5 Commits

Author SHA1 Message Date
Luke Campagnola
250ae84149 doc corrections
update contributors list
2014-02-28 21:09:03 -05:00
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
Luke Campagnola
2a27687fb2 merged updates from acq4 2013-03-07 15:29:56 -05:00
Luke Campagnola
6e5c5e402b merged many new features from ACQ4 2013-02-10 17:45:16 -05:00
Luke Campagnola
af59296231 Reorganized directory structure to be more standard
Started new SVG exporter
Merged updates from ACQ4
2012-12-25 00:43:31 -05:00