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

author Robert Konigsberg <konigsberg@google.com>

Sun, 17 Oct 2010 00:36:33 +0000 (20:36 -0400)

committer Robert Konigsberg <konigsberg@google.com>

Sun, 17 Oct 2010 00:36:33 +0000 (20:36 -0400)
author Robert Konigsberg <konigsberg@google.com>
Sun, 17 Oct 2010 00:36:33 +0000 (20:36 -0400)
committer Robert Konigsberg <konigsberg@google.com>
Sun, 17 Oct 2010 00:36:33 +0000 (20:36 -0400)
diff --cc docs/index.html
Simple merge
diff --cc dygraph-canvas.js
Simple merge
diff --cc dygraph.js
Simple merge
diff --cc tests/visibility.html

index c18feb8,c195d6d..743aa0d
--- 1/tests/visibility.html
--- 2/tests/visibility.html
+++ b/tests/visibility.html
@@@ -1,8 -1,8 +1,8 @@@
   <html>
     <head>
- -    <title>noise</title>
+ +    <title>visibility</title>
       <!--[if IE]>
-     <script type="text/javascript" src="excanvas.js"></script>
+     <script type="text/javascript" src="../excanvas.js"></script>
       <![endif]-->
       <script type="text/javascript" src="../strftime/strftime-min.js"></script>
       <script type="text/javascript" src="../rgbcolor/rgbcolor.js"></script>
author	Robert Konigsberg <konigsberg@google.com>
	Sun, 17 Oct 2010 00:36:33 +0000 (20:36 -0400)
committer	Robert Konigsberg <konigsberg@google.com>
	Sun, 17 Oct 2010 00:36:33 +0000 (20:36 -0400)
		1	2
docs/index.html	patch \|	diff1 \|	diff2 \|	blob \| history
dygraph-canvas.js	patch \|	diff1 \|	diff2 \|	blob \| history
dygraph.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/visibility.html	patch \|	diff1 \|	diff2 \|	blob \| history