From: Dan Vanderkam <dan@dygraphs.com>
Date: Sat, 6 Aug 2011 17:33:25 +0000 (-0400)
Subject: Merge branch 'master' into ticker
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=7a044f24081d8b1797c201cf252323b33850b287;p=dygraphs.git

Merge branch 'master' into ticker
---

7a044f24081d8b1797c201cf252323b33850b287
diff --cc auto_tests/misc/local.html
index 02bce45,0d653c1..3530b96
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@@ -23,9 -23,13 +23,14 @@@
    <script type="text/javascript" src="../tests/multi_csv.js"></script>
    <script type="text/javascript" src="../tests/to_dom_coords.js"></script>
    <script type="text/javascript" src="../tests/interaction_model.js"></script>
 +  <script type="text/javascript" src="../tests/tickers.js"></script>
    <script type="text/javascript" src="../tests/scrolling_div.js"></script>
    <script type="text/javascript" src="../tests/custom_bars.js"></script>
+   <script type="text/javascript" src="../tests/css.js"></script>
+   <script type="text/javascript" src="../tests/selection.js"></script>
+   <script type="text/javascript" src="../tests/update_options.js"></script>
+ 
+ 
    <script type="text/javascript">
    var tc = null;
    function processVariables() {