Merge branch 'master' into dev

This commit is contained in:
Thomas Breloff 2016-02-01 13:45:55 -05:00
commit adcbfb4b9e

View File

@ -97,7 +97,7 @@ function addUnicodeSeries!(o, d::Dict, addlegend::Bool, xlim, ylim)
label = addlegend ? d[:label] : "" label = addlegend ? d[:label] : ""
# if we happen to pass in allowed color symbols, great... otherwise let UnicodePlots decide # if we happen to pass in allowed color symbols, great... otherwise let UnicodePlots decide
color = d[:linecolor] in UnicodePlots.autoColors ? d[:linecolor] : :auto color = d[:linecolor] in UnicodePlots.color_cycle ? d[:linecolor] : :auto
# add the series # add the series
func(o, x, y; color = color, name = label, style = stepstyle) func(o, x, y; color = color, name = label, style = stepstyle)