- Merge branch 'master' of http://github.com/danvk/dygraphs
authorNeal Nelson <neal@makalumedia.com>
Fri, 1 Apr 2011 10:23:02 +0000 (12:23 +0200)
committerNeal Nelson <neal@makalumedia.com>
Fri, 1 Apr 2011 10:23:02 +0000 (12:23 +0200)
commite5152598cf72fb46c396f79edebc68e9fb4fec73
tree34b2de607837cb19665958f0da7a3d1cb6bdf40d
parentba049b8986972a9feb9c770e6094ea9035e9fb3b
parentd731e9648ed50ecd739792a5eb9ac9b2b21158bd
- Merge branch 'master' of github.com/danvk/dygraphs
- Change noZoomFlagChange option to isZoomedIgnoreProgrammaticZoom.
- Move the isZoomed demo to tests/is-zoomed.html.
Conflicts:
docs/index.html
dygraph.js
dygraph.js
tests/is-zoomed-ignore-programmatic-zoom.html
tests/is-zoomed.html
tests/zoom.html