Merge remote-tracking branch 'origin/master' into development

master
Robin Hu 11 years ago
commit 02ca4d7238

@ -655,8 +655,8 @@ nv.models.cumulativeLineChart = function() {
chart.rescaleY = function(_) {
if (!arguments.length) return rescaleY;
rescaleY = _
return rescaleY;
rescaleY = _;
return chart;
};
chart.showControls = function(_) {

Loading…
Cancel
Save