From: Dan Vanderkam <danvdk@gmail.com>
Date: Tue, 14 Sep 2010 00:37:21 +0000 (-0700)
Subject: merge upstream changes
X-Git-Tag: v1.0.0~664
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=a323ff4afd220f381ee00d4770e7624d4252a99d;p=dygraphs.git

merge upstream changes
---

a323ff4afd220f381ee00d4770e7624d4252a99d
diff --cc dygraph.js
index 724629a,37a9c30..4d086f7
--- a/dygraph.js
+++ b/dygraph.js
@@@ -2005,7 -2006,7 +2012,7 @@@ Dygraph.prototype.parseArray_ = functio
      var parsedData = Dygraph.clone(data);
      for (var i = 0; i < data.length; i++) {
        if (parsedData[i].length == 0) {
--        this.error("Row " << (1 + i) << " of data is empty");
++        this.error("Row " + (1 + i) + " of data is empty");
          return null;
        }
        if (parsedData[i][0] == null