fabric.js/dist
Tom French 0d8db88e71 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	dist/fabric.js
	dist/fabric.require.js
	src/brushes/circle_brush.class.js
	src/canvas.class.js
	src/mixins/canvas_events.mixin.js
	src/mixins/object_geometry.mixin.js
	src/mixins/object_interactivity.mixin.js
	src/shapes/group.class.js
	src/shapes/image.class.js
	src/shapes/object.class.js
	src/shapes/path_group.class.js
	src/shapes/text.class.js
2014-05-31 17:29:55 +01:00
..
fabric.js Merge remote-tracking branch 'upstream/master' 2014-05-31 17:29:55 +01:00
fabric.min.js Version 1.4.6 2014-05-25 15:12:32 +02:00
fabric.min.js.gz Version 1.4.6 2014-05-25 15:12:32 +02:00
fabric.require.js Merge remote-tracking branch 'upstream/master' 2014-05-31 17:29:55 +01:00