Luke Campagnola a72fec51b1 Merge branch 'infline-labels' into infiniteline-tests
Conflicts:
	pyqtgraph/graphicsItems/InfiniteLine.py
2016-02-22 00:06:04 -08:00
..
2016-02-05 00:55:34 -08:00
2015-07-31 14:51:34 -04:00
2015-07-12 14:24:12 -05:00
2014-03-03 12:56:15 -05:00
2016-01-30 09:52:37 -08:00
2014-06-13 18:02:39 -06:00
2016-02-03 12:52:01 +01:00
2015-02-28 11:46:41 -05:00
2014-08-07 09:03:26 -04:00
2016-02-21 23:28:24 -08:00