projects / dygraphs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fc453b 8d5846b)
merge in kberg changes
authorDan Vanderkam <dan@dygraphs.com>
Thu, 2 Jun 2011 21:33:29 +0000 (17:33 -0400)
committerDan Vanderkam <dan@dygraphs.com>
Thu, 2 Jun 2011 21:33:29 +0000 (17:33 -0400)
1  2 
auto_tests/misc/local.html patch | diff1 | diff2 | blob | history
dygraph-canvas.js patch | diff1 | diff2 | blob | history
dygraph.js patch | diff1 | diff2 | blob | history

diff --cc auto_tests/misc/local.html
index 6f0fd66,32814be..57764b1
--- 1/auto_tests/misc/local.html
--- 2/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@@ -24,7 -24,7 +24,8 @@@
    <script type="text/javascript" src="../tests/range_tests.js"></script>
    <script type="text/javascript" src="../tests/axis_labels.js"></script>
    <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>
  </head>
  <body>
    <div id='graph'></div>
diff --cc dygraph-canvas.js
Simple merge
diff --cc dygraph.js
Simple merge
danvk/dygraphs fork supporting touch events