From: Dan Vanderkam <danvk@google.com>
Date: Tue, 9 Aug 2011 21:56:10 +0000 (-0400)
Subject: Merge branch 'master' into ticker
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=827fbe83bc7bfdb7bad5e12849c71af5cf527114;p=dygraphs.git

Merge branch 'master' into ticker
---

827fbe83bc7bfdb7bad5e12849c71af5cf527114
diff --cc auto_tests/misc/local.html
index b19ae43,1fba05c..d05ed32
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@@ -28,9 -27,8 +28,10 @@@
    <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/rolling_average.js"></script>
    <script type="text/javascript" src="../tests/update_options.js"></script>
 +  <script type="text/javascript" src="../tests/utils_test.js"></script>
 +  <script type="text/javascript" src="../tests/multiple_axes.js"></script>
  
  
    <script type="text/javascript">