Eric Rowell 0486904512 resolved conflicts

2013-09-29 13:02:54 -07:00

..

Blob.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00

Circle.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00

Ellipse.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00

Image.js

resolved conflicts

2013-09-29 13:02:54 -07:00

Line.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00

Polygon.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00

Rect.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00

Spline.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00

Sprite.js

optmized buffer canvas requirement logic

2013-09-29 13:01:13 -07:00

Text.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00

Wedge.js

promoted to v4.7.1, and improved Shape docs

2013-09-16 22:05:28 -07:00