Merge remote-tracking branch 'upstream/dev' into jsdoc-fixes
Conflicts:
	src/core/text/Text.js
commit ca625a6c9f568b645dc9bf3a6f7b0fea9cd77507
2 parents 4eb0108 + 4cb3caa
@Pat Shanahan Pat Shanahan authored on 11 Apr 2016
Showing 8 changed files
View
package.json
View
src/core/const.js
View
src/core/display/DisplayObject.js
View
src/core/index.js
View
src/core/sprites/webgl/SpriteRenderer.js
View
src/core/text/Text.js
View
src/core/text/TextStyle.js 0 → 100644
View
src/interaction/interactiveTarget.js