Merge branch 'remove-old-options' into new-series-option, make new style axis specifi...
authorRobert Konigsberg <konigsberg@gmail.com>
Sun, 25 Nov 2012 04:11:14 +0000 (23:11 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Sun, 25 Nov 2012 04:11:14 +0000 (23:11 -0500)
commit6ad8b6a444ae32d026264409698f496506b3d33b
tree4218fd5500d1403b6725ac0d172f22b3586ebf88
parent632bd78ca394e97157f2e09e0f10a05f813a810b
parent95c6e8e68166281bd18aab32385ded0a1129464c
Merge branch 'remove-old-options' into new-series-option, make new style axis specification work.

Conflicts:
dygraph-options.js
auto_tests/tests/per_series.js
dygraph-options.js
dygraph.js