From: Dan Vanderkam <danvdk@gmail.com>
Date: Wed, 8 May 2013 23:13:05 +0000 (-0700)
Subject: Merge branch 'master' of github.com:danvk/dygraphs
X-Git-Tag: v1.0.0~29
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=b839102723a21830b8896413f9c3fa9b7c643238;hp=-c;p=dygraphs.git

Merge branch 'master' of github.com:danvk/dygraphs
---

b839102723a21830b8896413f9c3fa9b7c643238
diff --combined auto_tests/misc/local.html
index f34d18b,1604e8e..e168de0
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@@ -30,11 -30,13 +30,12 @@@
    <script type="text/javascript" src="../tests/dygraph-options-tests.js"></script>
    <script type="text/javascript" src="../tests/error_bars.js"></script>
    <script type="text/javascript" src="../tests/formats.js"></script>
+   <script type="text/javascript" src="../tests/grid_per_axis.js"></script>
    <script type="text/javascript" src="../tests/interaction_model.js"></script>
    <script type="text/javascript" src="../tests/missing_points.js"></script>
    <script type="text/javascript" src="../tests/multi_csv.js"></script>
    <script type="text/javascript" src="../tests/multiple_axes.js"></script>
    <script type="text/javascript" src="../tests/multiple_axes-old.js"></script>
 -  <script type="text/javascript" src="../tests/numeric-labels.js"></script>
    <script type="text/javascript" src="../tests/no_hours.js"></script>
    <script type="text/javascript" src="../tests/parser.js"></script>
    <script type="text/javascript" src="../tests/pathological_cases.js"></script>