Manual fix of merge issues. Somehow git clobbered some but not all of my
authorJeremy Brewer <jeremy.d.brewer@gmail.com>
Fri, 7 Jan 2011 20:40:06 +0000 (15:40 -0500)
committerJeremy Brewer <jeremy.d.brewer@gmail.com>
Fri, 7 Jan 2011 20:40:06 +0000 (15:40 -0500)
commit062ef40103ea8b5e3d135e3cba91af92e9278a33
tree84d8ae2175b0948f635f8cf9b8ef6154185669c8
parent6faebb690ea2b0660cc4fc95e96ad2e89b639f9b
Manual fix of merge issues.  Somehow git clobbered some but not all of my
changes when pulling from the main dygraphs repo, making a revert or diff
between commits difficult.  So I manually fixed the changes.  Ugh.
dygraph.js