Olly Smith 0e8c0f49b6 Merge branch, and merge with previous changes. ... Previous point-width work by other contributors conflicted, so have tied the two changes and sets of tests together. Have also slightly changed some variable / config names to read easier. Merge branch 'master' of https://github.com/dgilperez/morris.js into dgilperez-master Conflicts: lib/morris.line.coffee morris.js morris.min.js		2013-10-12 13:58:10 +01:00
..
morris.area.coffee	Fix area chart fill colors for very light lines (fixes #190).	2013-05-10 07:40:51 +01:00
morris.bar.coffee	Merge branch 'disable-individual-axes' of https://github.com/arachnys/morris.js into arachnys-disable-individual-axes	2013-10-12 13:32:25 +01:00
morris.coffee	Make event handlers chainable.	2013-05-10 07:41:09 +01:00
morris.donut.coffee	fixes #217, quick merge please	2013-04-10 22:00:50 +02:00
morris.grid.coffee	Merge branch 'disable-individual-axes' of https://github.com/arachnys/morris.js into arachnys-disable-individual-axes	2013-10-12 13:32:25 +01:00
morris.hover.coffee	Fixes #186 - changed CSS top value for hover to be an int	2013-04-24 23:22:29 -04:00
morris.line.coffee	Merge branch, and merge with previous changes.	2013-10-12 13:58:10 +01:00