projects / dygraphs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8b3c7b 30430ff)
Merge remote-tracking branch 'official/master' into per-axis-grid
authorDavid Eberlein <david.eberlein@ch.sauter-bc.com>
Wed, 8 May 2013 06:42:37 +0000 (08:42 +0200)
committerDavid Eberlein <david.eberlein@ch.sauter-bc.com>
Wed, 8 May 2013 06:42:37 +0000 (08:42 +0200)
Conflicts:
tests/two-axes.html

1  2 
auto_tests/misc/local.html patch | diff1 | diff2 | blob | history
dygraph.js patch | diff1 | diff2 | blob | history

diff --cc auto_tests/misc/local.html
Simple merge
diff --cc dygraph.js
Simple merge
danvk/dygraphs fork supporting touch events