From: Dan Vanderkam Date: Thu, 31 Mar 2011 15:21:15 +0000 (-0400) Subject: Merge branch 'master' of https://github.com/kberg/dygraphs X-Git-Tag: v1.0.0~536^2~8 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=44f29e932dcbe83c1bfaebb8735579392e27a5df;hp=965a030e724b6890b1ea651fb270d9fdc2699bb3;p=dygraphs.git Merge branch 'master' of https://github.com/kberg/dygraphs --- diff --git a/README b/README index 0fc135d..b604cba 100644 --- a/README +++ b/README @@ -50,11 +50,13 @@ dygraphs uses: - rgbcolor.js (Public Domain) - strftime.js (BSD License) - excanvas.js (Apache License) + - FlashCanvas (MIT License) - YUI compressor (BSD License) rgbcolor: http://www.phpied.com/rgb-color-parser-in-javascript/ strftime: http://tech.bluesmoon.info/2008/04/strftime-in-javascript.html excanvas: http://code.google.com/p/explorercanvas/ yui compressor: http://developer.yahoo.com/yui/compressor/ +flashcanvas: http://flashcanvas.net/ dygraphs is available under the MIT license, included in LICENSE.txt. diff --git a/docs/annotations.html b/docs/annotations.html index 546afe8..8e3ad4f 100644 --- a/docs/annotations.html +++ b/docs/annotations.html @@ -1,5 +1,7 @@ + + dygraphs annotations