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
..
line_spec.coffee	Merge branch, and merge with previous changes.	2013-10-12 13:58:10 +01:00