Commit Graph

3 Commits

Author SHA1 Message Date
Evert Timberg
12e2ace039 Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0dev-xy
Conflicts:
	src/Chart.Core.js

Fixed the sample files & chart type initialize methods so that this.data does not get set to undefined.
2015-05-20 09:03:22 -04:00
Christopher Weiss
7e21cb4e04 Pointed to core and doughnut. 2014-10-21 10:19:58 -04:00
Christopher Weiss
8984e8c2c4 Create doughnut.color.html
To test the new version of doughnut.
2014-10-21 10:16:30 -04:00