projects / dygraphs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 014a0f3 cc5806e)
Merge branch 'master' of https://github.com/danvk/dygraphs
authorRobert Konigsberg <konigsberg@gmail.com>
Fri, 4 Jan 2013 03:39:40 +0000 (22:39 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Fri, 4 Jan 2013 03:39:40 +0000 (22:39 -0500)
Conflicts:
auto_tests/tests/axis_labels.js
dygraph-options.js
plugins/axes.js


Trivial merge
danvk/dygraphs fork supporting touch events